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

Conflicts:
	js/controllers/selection-controller.js
	js/document/html-document.js
	js/panels/properties/content.reel/content.js

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

1 files changed, 11 insertions, 5 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index b1fb6352..a20a6090 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -181,7 +181,13 @@
                 "name": "Breadcrumb",
                 "properties":{
                     "element":{"#" : "breadCrumbComponent"}
-
+                },
+                "bindings" : {
+                    "container": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "currentSelectedContainer",
+                        "oneway": false
+                    }
                 }
              },
 
@@ -369,10 +375,10 @@
                             </section>
                         </section>
 
-                        <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section>
-                            <section id="breadCrumbTrail">
-                                <div id="breadCrumbComponent"></div>
-                            </section>
+                        <section id="breadCrumbComponent"></section>
+
+                        <section id="timelineResizer" class="timelineResizer resizeBar"></section>
+
                         <section id="bottomPanelContainer" class="panelContainer">
                             <section id="timelinePanel" class="panel">
                                 <div id="timelinePanelComponent"></div>