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

Conflicts:
	js/ninja.reel/ninja.html

1 files changed, 3 insertions, 5 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 1ce94722..c8625159 100644
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -285,8 +285,9 @@
                     "filePickerController": {"@": "filePickerController"},
                     "newFileController":    {"@": "newFileController"},
                     "documentBar":          {"@": "documentBar"},
+                    "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"}
-                 }
+                }
             }
         }
     </script>
@@ -349,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>