Merge branch 'master' into testing

1 files changed, 3 insertions, 1 deletions

diff --git a/.eslintrc b/.eslintrc
index 4fa7c2d7f..8af71bf4e 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -29,7 +29,8 @@
   "plugins": [
     "mocha",
     "chai",
-    "react"
+    "react",
+    "json"
   ],
 
   "globals": {
@@ -41,6 +42,7 @@
   },
 
   "rules": {
+    "no-restricted-globals": ["error", "event"],
     "accessor-pairs": 2,
     "arrow-spacing": [2, { "before": true, "after": true }],
     "block-spacing": [2, "always"],