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

Conflicts:
	js/controllers/document-controller.js

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

1 files changed, 3 insertions, 2 deletions

diff --git a/manifest.json b/manifest.json
index 2754c71e..3d156d2b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -11,10 +11,11 @@
     "128": "ninja_icon_128.png"
   },
   "permissions": [
+        "tabs",
     "unlimitedStorage",
     "notifications",
-    "webRequestBlocking",
-    "webRequest"
+    "webRequest",
+    "webRequestBlocking"
   ],
   "requirements": {
     "3D": {