fixes merge issues

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

@@ -1,31 +1,34 @@
 {
-  "name": "Umbraco",
-  "version": "7",
-  "homepage": "https://github.com/umbraco/Umbraco-CMS",
-  "authors": [
-    "Shannon <sdeminick@umbraco.com>"
-  ],
-  "description": "Umbraco CMS",
-  "license": "MIT",
-  "private": true,
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "typeahead.js": "~0.10.5",
-    "underscore": "~1.7.0",
-    "rgrove-lazyload": "*",
-    "jquery": "2.0.3",
-    "jquery-file-upload": "~9.4.0",
-    "jquery-ui": "1.10.3",
-        "angular-dynamic-locale":  "~0.1.27",
-    "bootstrap-tabdrop": "~1.0.0"
+    "name": "Umbraco",
+    "version": "7",
+    "homepage": "https://github.com/umbraco/Umbraco-CMS",
+    "authors": [
+        "Shannon <sdeminick@umbraco.com>"
+    ],
+    "description": "Umbraco CMS",
+    "license": "MIT",
+    "private": true,
+    "ignore": [
+        "**/.*",
+        "node_modules",
+        "bower_components",
+        "test",
+        "tests"
+    ],
+    "dependencies": {
+        "typeahead.js": "~0.10.5",
+        "underscore": "~1.7.0",
+        "rgrove-lazyload": "*",
+        "jquery": "2.0.3",
+        "jquery-file-upload": "~9.4.0",
+        "jquery-ui": "1.10.3",
+        "angular-dynamic-locale": "~0.1.27",
+        "bootstrap-tabdrop": "~1.0.0"
     },
     "exportsOverride": {
+        "bootstrap-tabdrop": { 
+            "": "build/js/bootstrap-tabdrop.min.js"
+        },
         "rgrove-lazyload": {
             "": "lazyload.js"
         },
@@ -39,7 +42,7 @@
             "": "tmhDynamicLocale.min.{js,js.map}"
         },
         "jquery": {
-            "": "jquery.min.{js,map}"  
+            "": "jquery.min.{js,map}"
         },
         "jquery-file-upload": {
             "": "**/jquery.{fileupload,fileupload-process,fileupload-angular,fileupload-image}.js"
@@ -54,9 +57,9 @@
         "blueimp-tmpl": {
             "ignore": "*.ignore"
         },
-        
+
         "blueimp-canvas-to-blob": {
             "ignore": "*.ignore"
         }
-  }
+    }
 }

src/Umbraco.Web.UI.Client/gruntFile.js

@@ -418,10 +418,7 @@ module.exports = function (grunt) {
                         //this is the same as 'byComponent', however we will not allow
                         // folders with '.' in them since the grunt copy task does not like that
                         var componentWithoutPeriod = component.replace(".", "-");
-                        return path.join(componentWithoutPeriod, type);
-                        },
-                        'bootstrap-tabdrop': {
-                            keepExpandedHierarchy: false
+                        return path.join(componentWithoutPeriod, type);                        
                     }
                 }
             }

src/Umbraco.Web.UI.Client/src/loader.js

@@ -21,7 +21,7 @@ LazyLoad.js(
         'lib/jquery-file-upload/jquery.fileupload-angular.js',
 
         'lib/bootstrap/js/bootstrap.2.3.2.min.js',
-        'lib/bootstrap-tabdrop/bootstrap-tabdrop.js',
+        'lib/bootstrap-tabdrop/bootstrap-tabdrop.min.js',
 	    'lib/umbraco/Extensions.js',
 
         'lib/umbraco/NamespaceManager.js',

src/Umbraco.Web/UI/JavaScript/JsInitialize.js

@@ -20,7 +20,7 @@
     'lib/jquery-file-upload/jquery.fileupload-angular.js',
 
     'lib/bootstrap/js/bootstrap.2.3.2.min.js',
-    'lib/bootstrap-tabdrop/bootstrap-tabdrop.js',
+    'lib/bootstrap-tabdrop/bootstrap-tabdrop.min.js',
 	'lib/umbraco/Extensions.js',
     
     'lib/umbraco/NamespaceManager.js',