Merge branch 'refs/heads/ninja-internal-master' into bugfix-master

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 2ed596f3..215f8f2e 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -40,7 +40,13 @@
             "focusManager": {
                 "object": "js/components/focus-manager.reel"
             },
-            
+
+            "bindingView": {
+                "prototype": "js/stage/binding-view.reel",
+                "properties" : {
+                    "element": {"#": "bindingView" }
+                }
+            },
             "owner": {
                 "prototype": "js/stage/stage.reel",
                 "properties": {
@@ -53,7 +59,8 @@
                     "stageDeps": {"@": "stageDeps"},
                     "layout":   {"@": "layout"},
                     "textTool": {"@": "textTool"},
-                    "focusManager": {"@": "focusManager"}
+                    "focusManager": {"@": "focusManager"},
+                    "bindingView": {"@": "bindingView"}
                 },
                 "bindings": {
                     "currentDocumentStageView": {
@@ -77,6 +84,7 @@
         <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas>
         <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas>
         <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas>
+        <section data-montage-id="bindingView"></section>
     </section>
 
 </body>