Merge branch 'master' into open199

2015-12-08 15:42:37 -08:00
parent 773cedddd5 89a93e2966
commit b5c741c911
8 changed files with 162 additions and 6 deletions
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -229,10 +229,6 @@
                "templateUrl": "templates/subtree.html",
                "uses": [ "composition" ]
            },
-            {
-                "key": "test",
-                "templateUrl": "templates/test.html"
-            },
            {
                "key": "tree-node",
                "templateUrl": "templates/tree-node.html",