Merge branch 'refs/heads/master' into StylesControllerUpdates

Conflicts:
	js/controllers/styles-controller.js

2 files changed, 11 insertions, 7 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>
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 90015f5a..469d38f7 100644
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -14,7 +14,7 @@ exports.Ninja = Montage.create(Component, {
     _preload: { value: false },
 
     ninjaVersion: {
-        value: window.ninjaVersion.ninja.version
+        value: null
     },
 
     toolsData: { value: null },
@@ -34,6 +34,7 @@ exports.Ninja = Montage.create(Component, {
 
     templateDidLoad: {
         value: function() {
+            this.ninjaVersion = window.ninjaVersion.ninja.version;
             this.eventManager.addEventListener( "preloadFinish", this, false);
         }
     },