Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 21 insertions, 0 deletions

diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index 1c144bf4..b22b3609 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -17,6 +17,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_0"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -24,6 +27,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_1"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -31,6 +37,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_2"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -38,6 +47,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_3"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -45,6 +57,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_4"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -52,6 +67,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_5"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -60,6 +78,9 @@
                 "name": "Panel",
                 "properties": {
                     "element": {"#": "panel_6"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },