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, 3 insertions, 3 deletions

diff --git a/node_modules/montage/ui/tabs.reel/tabs.html b/node_modules/montage/ui/tabs.reel/tabs.html
index 7ea9a438..f069d1cb 100755
--- a/node_modules/montage/ui/tabs.reel/tabs.html
+++ b/node_modules/montage/ui/tabs.reel/tabs.html
@@ -11,7 +11,7 @@
         <script type="text/montage-serialization">{
 
     "navController": {
-        "prototype": "montage/ui/controller/array-controller",
+        "prototype": "ui/controller/array-controller",
         "properties": {
             "selectObjectsOnAddition": true,
             "automaticallyOrganizeObjects": true
@@ -22,7 +22,7 @@
     },
 
     "repetition1": {
-        "prototype": "montage/ui/repetition.reel",
+        "prototype": "ui/repetition.reel",
         "properties": {
             "element": {
                 "#": "tab-list"
@@ -33,7 +33,7 @@
     },
 
     "owner": {
-        "prototype": "montage/ui/tabs.reel",
+        "prototype": "ui/tabs.reel",
         "properties": {
             "element": {
                 "#": "tabs-nav"