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, 15 insertions, 0 deletions

diff --git a/js/panels/presets/presets-panel.js b/js/panels/presets/presets-panel.js
new file mode 100644
index 00000000..091c5cb9
--- /dev/null
+++ b/js/panels/presets/presets-panel.js
@@ -0,0 +1,15 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+var Montage = require("montage/core/core").Montage;
+var PanelBase = require("js/panels/PanelBase").PanelBase;
+var Content = require("js/panels/presets/content.reel").content;
+
+exports.PresetsPanel = Montage.create(PanelBase, {
+    panelName : { value: "Presets" },
+    minHeight : { value: 200 },
+    content : { value: Content }
+});
\ No newline at end of file