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

diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index b22b3609..820348d2 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -74,8 +74,7 @@
             },
 
             "panel_6": {
-                "module": "js/panels/Panel.reel",
-                "name": "Panel",
+                "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_6"}
                 },
@@ -84,6 +83,16 @@
                 }
             },
 
+            "panel_7": {
+                "prototype": "js/panels/Panel.reel",
+                "properties": {
+                    "element": {"#": "panel_7"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
+                }
+            },
+
             "owner": {
                 "prototype": "js/panels/PanelContainer.reel",
                 "properties": {
@@ -95,7 +104,8 @@
                     "panel_3":          {"@": "panel_3"},
                     "panel_4":          {"@": "panel_4"},
                     "panel_5":          {"@": "panel_5"},
-                    "panel_6":          {"@": "panel_6"}
+                    "panel_6":          {"@": "panel_6"},
+                    "panel_7":          {"@": "panel_7"}
                 },
                 "listeners": [
                     {
@@ -126,6 +136,7 @@
             <article data-montage-id="panel_4"></article>
             <article data-montage-id="panel_5"></article>
             <article data-montage-id="panel_6"></article>
+            <article data-montage-id="panel_7"></article>
                 </article>
     </section>
 </body>