Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

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

1 files changed, 1 insertions, 0 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 07347cd7..9de0e86e 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -288,6 +288,7 @@
                     "stage":                {"@": "stage1"},
                     "settings":             {"@": "settings1"},
                     "elementMediator":      {"@": "elementMediator"},
+                    "dragDropMediator":     {"@": "dragDropMediator"},
                     "undocontroller":       {"@": "undocontroller1"},
                     "selectionController":  {"@": "selectionController1"},
                     "documentController":   {"@": "documentController1"},