Merge branch 'dev-v7' into dev-v7-contenttypeeditor

Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/common/directives/editors/umbAutoResize.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/imaging/umbimagefolder.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/util/delayedMouseLeave.directive.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj

src/Umbraco.Web.UI.Client/bower.json

@@ -26,7 +26,6 @@
         "angular-dynamic-locale": "~0.1.27",
         "ng-file-upload": "~3.0.2",
         "tinymce": "~4.1.10",
-    "bootstrap-tabdrop": "~1.0.0",
     "codemirror": "~5.3.0"
     }
 }