Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 3 insertions, 2 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 73612736..2f904d62 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
@@ -32,12 +32,13 @@
     },
 
     "resultItem": {
-        "prototype": "montage/ui/dynamic-text.reel",
+        "prototype": "montage/ui/autocomplete/result-item.reel",
         "properties": {
             "element": {"#": "result-item"}
         },
         "bindings": {
-            "value": {"<-": "@repetition1.objectAtCurrentIteration"}
+            "textPropertyPath": {"<-": "@owner.textPropertyPath"},
+            "object": {"<-": "@repetition1.objectAtCurrentIteration"}
         }
     },