Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

Conflicts:
	css/ninja.css
	js/stage/stage.reel/stage.html
	js/tools/TextTool.js
	node_modules/labs/rich-text-editor.reel/rich-text-editor.css
	node_modules/labs/rich-text-editor.reel/rich-text-editor.html
	node_modules/labs/rich-text-editor.reel/rich-text-editor.js
	node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
	node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/manifest.json b/manifest.json
new file mode 100644
index 00000000..12047172
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,25 @@
+{
+  "name": "Motorola Ninja",
+  "description": "Motorola Ninja HTML5 Authoring Tool Pre-Alpha",
+  "version": "0.5.0.0",
+  "app": {
+    "launch": {
+      "local_path": "index.html"
+    }
+  },
+  "icons": {
+    "128": "ninja_icon_128.png"
+  },
+  "permissions": [
+    "unlimitedStorage",
+    "notifications"
+  ],
+  "requirements": {
+    "3D": {
+      "features": ["css3d", "webgl"]
+    }
+  },
+  "minimum_chrome_version": "16.0.0.0",
+  "offline_enabled": true,
+  "update_url": "http://tetsubo.org/go/ninjaupdate"
+}
\ No newline at end of file