Merge branch 'master' into open117

2015-09-23 15:54:48 -07:00
parent f4e53a946d 6ce4ce6ada
commit 9811443c71
168 changed files with 14612 additions and 6722 deletions
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -6,7 +6,7 @@
        "services": [
            {
                "key": "urlService",
-                "implementation": "/services/UrlService.js",
+                "implementation": "services/UrlService.js",
                "depends": [ "$location" ]
            }
        ],
@@ -20,18 +20,6 @@
            {
                "stylesheetUrl": "css/normalize.min.css",
                "priority": "mandatory"
-            },
-            {
-                "stylesheetUrl": "css/theme-espresso.css",
-                "priority": 1000
-            },
-            {
-                "stylesheetUrl": "css/items.css",
-                "priority": 901
-            },
-            {
-                "stylesheetUrl": "css/tree.css",
-                "priority": 900
            }
        ],
        "templates": [