Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	js/ninja.reel/ninja.html
	js/stage/stage.reel/stage.html

1 files changed, 5 insertions, 7 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index c170b16f..a17f6583 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -293,7 +293,8 @@
                     "newFileController":    {"@": "newFileController"},
                     "coreIoApi":                {"@": "coreIoApi1"},
                     "documentBar":          {"@": "documentBar"},
-                    "ioMediator":           {"@": "ioMediator"}
+                    "ioMediator":           {"@": "ioMediator"},
+                    "timeline":             {"@": "timeline"}
                 }
             }
 
@@ -358,13 +359,10 @@
                         </section>
 
                         <section id="timelineResizer" class="timelineResizer resizeBar"></section>
-
+                        <section id="breadCrumbTrail">
+                                                        <div id="breadCrumbComponent"></div>
+                                                    </section>
                         <section id="bottomPanelContainer" class="panelContainer">
-
-                            <section id="breadCrumbTrail">
-                                <div id="breadCrumbComponent"></div>
-                            </section>
-
                             <section id="timelinePanel" class="panel">
                                 <div id="timelinePanelComponent"></div>
                             </section>