Merge branch 'open-master' into open962

Merge in latest from open-master into topic branch for WTD-962
2015-04-10 17:30:03 -07:00
parent 952f380c33 79f6e8c082
commit f6df73c11b
24 changed files with 738 additions and 55 deletions
--- a/platform/commonUI/browse/bundle.json
+++ b/platform/commonUI/browse/bundle.json
@@ -108,7 +108,8 @@
                "templateUrl": "templates/items/items.html",
                "uses": [ "composition" ],
                "gestures": [ "drop" ],
-                "type": "folder"
+                "type": "folder",
+                "editable": false
            }
        ],
        "components": [