Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index a6b98aeb..add43ee7 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.html
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html
@@ -13,12 +13,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             "owner": {
                 "prototype" : "js/panels/presets/transitions-presets.reel[TransitionsLibrary]",
                 "properties" : {
-                    "element" : {"#" : "transitionsLibrary"},
-                    "treeList" : {"@" : "treeList"}
+                    "element" : {"#" : "transitionsLibrary"}
                 }
             },
             "presetsController" : {
-                "prototype": "js/controllers/tree-controller",
+                "prototype": "js/components/controllers/tree-controller",
                 "properties" : {
                     "branchKey" : "children",
                     "labelKey" : "text",