Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/js/models/app-model.js b/js/models/app-model.js
index 57394bb9..bfa1871c 100755
--- a/js/models/app-model.js
+++ b/js/models/app-model.js
@@ -325,6 +325,19 @@ exports.AppModel = Montage.create(Component, {
         }
     },
 
+    _presetsPanel: {
+        value: true
+    },
+
+    PresetsPanel: {
+        get: function() {
+            return this._presetsPanel;
+        },
+        set: function(value) {
+            this._presetsPanel = value;
+        }
+    },
+
     _materials: {
         value: []
     },