Merge branch 'master' into pentool

Conflicts:
	manifest.json

1 files changed, 9 insertions, 9 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 1393b4b9..b1fb6352 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -22,9 +22,9 @@
                 "name": "Preloader"
             },
 
-            "settings1": {
-                "module": "js/data/settings",
-                "name": "Settings"
+            "localStorage": {
+                "module": "js/controllers/local-storage-controller",
+                "name": "LocalStorage"
             },
 
             "toolsData1": {
@@ -324,12 +324,12 @@
             <nav id="mainMenuBar"></nav>
         </section>
 
-        <section id="leftSplitter" class="leftSplitter splitter"></section>
+        <section data-montage-id="leftSplitter" class="leftSplitter splitter"></section>
 
-        <section id="rightSplitter" class="rightSplitter splitter"></section>
+        <section data-montage-id="rightSplitter" class="rightSplitter splitter"></section>
 
         <section id="appContainer">
-            <section id="topSplitter" class="topSplitter splitter"></section>
+            <section data-montage-id="topSplitter" class="topSplitter splitter"></section>
 
             <section id="topPanelContainer" class="panelContainer">
                 <div id="topPanel" class="panel">
@@ -369,7 +369,7 @@
                             </section>
                         </section>
 
-                        <section id="timelineResizer" class="timelineResizer resizeBar"></section>
+                        <section data-montage-id="timelineResizer" class="timelineResizer resizeBar"></section>
                             <section id="breadCrumbTrail">
                                 <div id="breadCrumbComponent"></div>
                             </section>
@@ -381,7 +381,7 @@
                     </section>
                 </section>
 
-                <section id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
+                <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
 
                 <section id="rightPanelContainer" class="panelContainer">
                     <section id="rightPanelContent">
@@ -389,7 +389,7 @@
                 </section>
             </section>
 
-            <section id="bottomSplitter" class="bottomSplitter splitter"></section>
+            <section data-montage-id="bottomSplitter" class="bottomSplitter splitter"></section>
         </section>
         
         <section id="popupWindows"></section>