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

Conflicts:
	css/ninja.css
	js/stage/stage.reel/stage.html
	js/tools/TextTool.js
	node_modules/labs/rich-text-editor.reel/rich-text-editor.css
	node_modules/labs/rich-text-editor.reel/rich-text-editor.html
	node_modules/labs/rich-text-editor.reel/rich-text-editor.js
	node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
	node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 706c8243..c8625159 100644
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -259,6 +259,11 @@
                 "name": "NewFileWorkflowController"
             },
 
+            "mainMenuController": {
+                "module": "js/controllers/main-menu-controller",
+                "name": "MainMenuController"
+            },
+
             "owner": {
                 "module": "js/ninja.reel",
                 "name": "Ninja",
@@ -279,10 +284,11 @@
                     "stylesController":     {"@": "stylesController"},
                     "filePickerController": {"@": "filePickerController"},
                     "newFileController":    {"@": "newFileController"},
-                    "documentBar":          {"@": "documentBar"}
+                    "documentBar":          {"@": "documentBar"},
+                    "timeline":             {"@": "timeline"},
+                    "mainMenuController":   {"@": "mainMenuController"}
                 }
             }
-
         }
     </script>
 
@@ -344,13 +350,10 @@
                         </section>
 
                         <section id="timelineResizer" class="timelineResizer resizeBar"></section>
-
-                        <section id="bottomPanelContainer" class="panelContainer">
-
                             <section id="breadCrumbTrail">
                                 <div id="breadCrumbComponent"></div>
                             </section>
-
+                        <section id="bottomPanelContainer" class="panelContainer">
                             <section id="timelinePanel" class="panel">
                                 <div id="timelinePanelComponent"></div>
                             </section>