Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes

Conflicts:
	js/panels/properties.reel/sections/position-size.reel/position-size.html

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html
index a0913331..0b525746 100644
--- a/node_modules/montage/ui/scroller.reel/scroller.html
+++ b/node_modules/montage/ui/scroller.reel/scroller.html
@@ -10,7 +10,7 @@
     <script type="text/montage-serialization">{
 
             "scrollbars": {
-                "prototype": "montage/ui/scroll-bars.reel",
+                "prototype": "ui/scroll-bars.reel",
                 "properties": {
                     "element": {
                         "#": "scrollbars"
@@ -18,7 +18,7 @@
                 }
             },
             "translateComposer1": {
-                "prototype": "montage/ui/composer/translate-composer",
+                "prototype": "ui/composer/translate-composer",
                 "properties": {
                     "component": {"@": "owner"},
                     "minTranslateX": 0,
@@ -26,8 +26,8 @@
                     "invertAxis": true
                 },
                 "bindings": {
-                    "translateX": {"<<->": "@owner.scrollX"},
-                    "translateY": {"<<->": "@owner.scrollY"},
+                    "translateX": {"<->": "@owner.scrollX"},
+                    "translateY": {"<->": "@owner.scrollY"},
                     "maxTranslateX": {"<-": "@owner._maxTranslateX"},
                     "maxTranslateY": {"<-": "@owner._maxTranslateY"},
                     "axis": {"<-": "@owner.axis"},
@@ -45,7 +45,7 @@
                 ]
             },
             "slot": {
-                "prototype": "montage/ui/slot.reel",
+                "prototype": "ui/slot.reel",
                 "properties": {
                     "element": {"#": "content"}
                 },
@@ -54,7 +54,7 @@
                 }
             },
             "owner": {
-                "prototype": "montage/ui/scroller.reel",
+                "prototype": "ui/scroller.reel",
                 "properties": {
                     "_content": {
                         "#": "content"