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, 5 insertions, 6 deletions

diff --git a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html
index 2f904d62..c40d36ce 100644
--- a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html
+++ b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html
@@ -9,21 +9,20 @@
 {
 
     "results": {
-        "prototype": "montage/ui/controller/array-controller",
+        "prototype": "ui/controller/array-controller",
         "properties": {
             "selectObjectsOnAddition": true,
             "automaticallyOrganizeObjects": true
         }
     },
     "repetition1": {
-        "prototype": "montage/ui/repetition.reel",
+        "prototype": "ui/repetition.reel",
         "properties": {
             "element": {
                 "#": "repetition1"
             },
             "contentController": {"@": "results"},
-            "isSelectionEnabled": true,
-            "orientation": "vertical"
+            "isSelectionEnabled": true
         },
         "bindings": {
             "contentController": {"<-": "@owner.contentController"},
@@ -32,7 +31,7 @@
     },
 
     "resultItem": {
-        "prototype": "montage/ui/autocomplete/result-item.reel",
+        "prototype": "ui/autocomplete/result-item.reel",
         "properties": {
             "element": {"#": "result-item"}
         },
@@ -43,7 +42,7 @@
     },
 
     "owner": {
-        "prototype": "montage/ui/autocomplete/results-list.reel",
+        "prototype": "ui/autocomplete/results-list.reel",
         "properties": {
             "element": {"#": "results-list"}
         }