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

diff --git a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js
index 795e74e0..0950314d 100644
--- a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js
+++ b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.js
@@ -7,10 +7,11 @@ var Montage = require("montage").Montage,
     Component = require("ui/component").Component;
 
 exports.ResultsList = Montage.create(Component, {
-    
+
+    textPropertyPath: {value: null},
+
     // contentController -> this.repetition.contentController
     contentController: {value: null},
-    
-    activeIndexes: {value: null}
 
+    activeIndexes: {value: null}
 });