Merge branch 'refs/heads/master' into montage-v10-integration

Conflicts:
	js/io/system/ninjalibrary.json
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a63422fb..00740ea9 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -246,7 +246,7 @@
                     "element":{"#" : "breadCrumbComponent"}
                 },
                 "bindings" : {
-                    "container": {"<-": "@owner.currentSelectedContainer"},
+
                     "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
@@ -291,7 +291,6 @@
             "selectionController": {
                 "prototype": "js/controllers/selection-controller",
                 "bindings" : {
-                    "selectionContainer": {"<-": "@owner.currentSelectedContainer"},
                     "currentDocument": {"<-": "@documentList.selectedObjects.0"},
                     "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"}
                 }