Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

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

1 files changed, 6 insertions, 2 deletions

diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index 9eb338d8..c8da1e7e 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -37,10 +37,11 @@
             "hud": {
                 "prototype": "js/stage/binding-view.reel/binding-hud.reel",
                 "properties": {
-                    "element": {"#" : "hud"}
+                    "element": {"#" : "hud"},
+                    "panelData": {"@": "panelData"}
                 },
                 "bindings": {
-                    "userComponent": {"<-": "@hudRepeater.objectAtCurrentIteration"}
+                    "userElement": {"<-": "@hudRepeater.objectAtCurrentIteration"}
                 },
                 "listeners": [
                     {
@@ -48,6 +49,9 @@
                         "listener": {"@": "owner"}
                     }
                 ]
+            },
+            "panelData": {
+                "object": "js/data/pi/pi-data[PiData]"
             }
         }
     </script>