Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/lib/NJUtils.js

1 files changed, 9 insertions, 0 deletions

diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html
index 1663c26b..a0913331 100644
--- a/node_modules/montage/ui/scroller.reel/scroller.html
+++ b/node_modules/montage/ui/scroller.reel/scroller.html
@@ -44,6 +44,15 @@
                     }
                 ]
             },
+            "slot": {
+                "prototype": "montage/ui/slot.reel",
+                "properties": {
+                    "element": {"#": "content"}
+                },
+                "bindings": {
+                    "domContent": {"<-": "@owner.domContent"}
+                }
+            },
             "owner": {
                 "prototype": "montage/ui/scroller.reel",
                 "properties": {