Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 8 insertions, 9 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a20a6090..8f6f6d7b 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -16,12 +16,6 @@
 
     <script type="text/montage-serialization">
         {
-
-            "preloader1": {
-                "module": "js/preloader/preloader",
-                "name": "Preloader"
-            },
-
             "localStorage": {
                 "module": "js/controllers/local-storage-controller",
                 "name": "LocalStorage"
@@ -37,6 +31,11 @@
                 "name": "AppModel"
             },
 
+            "materialsModel": {
+                "module": "js/models/materials-model",
+                "name": "MaterialsModel"
+            },
+
             "menu": {
                 "module": "js/components/menu/menu.reel",
                 "name": "Menu",
@@ -167,7 +166,7 @@
             },
 
             "panelContainer": {
-                "module": "js/panels/PanelContainer/PanelContainer.reel",
+                "module": "js/panels/PanelContainer.reel",
                 "name": "PanelContainer",
                 "properties": {
                     "element": {"#": "rightPanelContent"},
@@ -389,8 +388,8 @@
 
                 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
 
-                <section id="rightPanelContainer" class="panelContainer">
-                    <section id="rightPanelContent">
+                <section id="rightPanelContainer" class="rightPanelContainer panelContainer">
+                    <section id="rightPanelContent" class="rightPanelContent">
                     </section>
                 </section>
             </section>