Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

1 files changed, 10 insertions, 2 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index c9f17e3b..022b3f0a 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -228,7 +228,15 @@
 
             "selectionController1": {
                 "module": "js/controllers/selection-controller",
-                "name": "SelectionController"
+                "name": "SelectionController",
+                "bindings" : {
+                    "selectionContainer": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "currentSelectedContainer",
+                        "oneway": true
+                    }
+                }
+
             },
 
             "documentController1": {
@@ -255,7 +263,7 @@
             },
 
             "filePickerController": {
-                "module": "js/components/ui/FilePicker/file-picker-controller",
+                "module": "js/io/ui/file-picker/file-picker-controller",
                 "name": "FilePickerController"
             },