diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index 500421949b..e742b8e249 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -916,9 +916,9 @@
       "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
     },
     "eslint": {
-      "version": "2.2.0",
-      "from": "eslint@2.2.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.2.0.tgz",
+      "version": "2.3.0",
+      "from": "eslint@2.3.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.3.0.tgz",
       "dependencies": {
         "argparse": {
           "version": "1.0.7",
@@ -996,11 +996,6 @@
       "from": "estraverse@>=4.1.1 <5.0.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"
     },
-    "estraverse-fb": {
-      "version": "1.3.1",
-      "from": "estraverse-fb@>=1.3.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/estraverse-fb/-/estraverse-fb-1.3.1.tgz"
-    },
     "esutils": {
       "version": "2.0.2",
       "from": "esutils@>=2.0.0 <3.0.0",
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index 5624d0c104..1bf696daeb 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -2,7 +2,7 @@
     "root": true,
     "parser": "babel-eslint",
     "parserOptions": {
-        "ecmaVersion": 6,
+        "ecmaVersion": 7,
         "sourceType": "module"
     },
     "env": {
@@ -13,177 +13,178 @@
     "rules": {
 
         // Possible Errors
-        "comma-dangle": [2, "never"],
-        "handle-callback-err": 2,
-        "no-bitwise": 2,
-        "no-cond-assign": 2,
-        "no-console": 2,
-        "no-constant-condition": 2,
-        "no-control-regex": 2,
-        "no-debugger": 2,
-        "no-dupe-args": 2,
-        "no-dupe-keys": 2,
-        "no-duplicate-case": 2,
-        "no-empty": 2,
-        "no-empty-character-class": 2,
-        "no-empty-pattern": 2,
-        "no-ex-assign": 2,
-        "no-extra-boolean-cast": 2,
-        "no-extra-parens": 0,
-        "no-extra-semi": 2,
-        "no-func-assign": 2,
-        "no-inner-declarations": 2,
-        "no-invalid-regexp": 2,
-        "no-irregular-whitespace": 2,
-        "no-negated-in-lhs": 2,
-        "no-obj-calls": 2,
-        "no-regex-spaces": 2,
-        "no-self-assign": 2,
-        "no-sparse-arrays": 2,
-        "no-unexpected-multiline": 2,
-        "no-unreachable": 2,
-        "use-isnan": 2,
-        "valid-jsdoc": 0,
-        "valid-typeof": 2,
+        "comma-dangle": ["error", "never"],
+        "handle-callback-err": "error",
+        "no-bitwise": "error",
+        "no-cond-assign": "error",
+        "no-console": "error",
+        "no-constant-condition": "error",
+        "no-control-regex": "error",
+        "no-debugger": "error",
+        "no-dupe-args": "error",
+        "no-dupe-keys": "error",
+        "no-duplicate-case": "error",
+        "no-empty": "error",
+        "no-empty-character-class": "error",
+        "no-empty-pattern": "error",
+        "no-ex-assign": "error",
+        "no-extra-boolean-cast": "error",
+        "no-extra-parens": "off",
+        "no-extra-semi": "error",
+        "no-func-assign": "error",
+        "no-inner-declarations": "error",
+        "no-invalid-regexp": "error",
+        "no-irregular-whitespace": "error",
+        "no-negated-in-lhs": "error",
+        "no-obj-calls": "error",
+        "no-regex-spaces": "error",
+        "no-restricted-globals": ["error", "event"],
+        "no-self-assign": "error",
+        "no-sparse-arrays": "error",
+        "no-unexpected-multiline": "error",
+        "no-unreachable": "error",
+        "use-isnan": "error",
+        "valid-jsdoc": "off",
+        "valid-typeof": "error",
 
         //Best Practices
-        "accessor-pairs": 2,
-        "block-scoped-var": 2,
-        "consistent-return": 2,
-        "curly": 2,
-        "default-case": 2,
-        "dot-location": 0,
-        "dot-notation": 0,
-        "eqeqeq": 2,
-        "guard-for-in": 2,
-        "no-alert": 2,
-        "no-caller": 2,
-        "no-case-declarations": 2,
-        "no-div-regex": 2,
-        "no-else-return": 2,
-        "no-eq-null": 2,
-        "no-eval": 2,
-        "no-extend-native": 2,
-        "no-extra-bind": 2,
-        "no-fallthrough": 2,
-        "no-floating-decimal": 2,
-        "no-implicit-coercion": 2,
-        "no-implied-eval": 2,
-        "no-invalid-this": 0,
-        "no-iterator": 2,
-        "no-labels": 2,
-        "no-lone-blocks": 2,
-        "no-loop-func": 2,
-        "no-magic-numbers": [2, {"ignore": [-1, 0, 1]}],
-        "no-multi-spaces": 0,
-        "no-multi-str": 2,
-        "no-native-reassign": 2,
-        "no-new": 2,
-        "no-new-func": 0,
-        "no-new-wrappers": 2,
-        "no-octal": 2,
-        "no-octal-escape": 2,
-        "no-param-reassign": 0,
-        "no-process-env": 2,
-        "no-proto": 2,
-        "no-redeclare": 2,
-        "no-return-assign": 2,
-        "no-script-url": 2,
-        "no-self-compare": 2,
-        "no-sequences": 2,
-        "no-throw-literal": 2,
-        "no-unused-expressions": 2,
-        "no-useless-call": 2,
-        "no-useless-concat": 2,
-        "no-void": 2,
-        "no-warning-comments": 0,
-        "no-with": 2,
-        "radix": 2,
-        "vars-on-top": 0,
-        "wrap-iife": 2,
-        "yoda": 2,
+        "accessor-pairs": "error",
+        "block-scoped-var": "error",
+        "consistent-return": "error",
+        "curly": "error",
+        "default-case": "error",
+        "dot-location": "off",
+        "dot-notation": "off",
+        "eqeqeq": "error",
+        "guard-for-in": "error",
+        "no-alert": "error",
+        "no-caller": "error",
+        "no-case-declarations": "error",
+        "no-div-regex": "error",
+        "no-else-return": "error",
+        "no-eq-null": "error",
+        "no-eval": "error",
+        "no-extend-native": "error",
+        "no-extra-bind": "error",
+        "no-fallthrough": "error",
+        "no-floating-decimal": "error",
+        "no-implicit-coercion": "error",
+        "no-implied-eval": "error",
+        "no-invalid-this": "off",
+        "no-iterator": "error",
+        "no-labels": "error",
+        "no-lone-blocks": "error",
+        "no-loop-func": "error",
+        "no-magic-numbers": ["error", {"ignore": [-1, 0, 1]}],
+        "no-multi-spaces": "off",
+        "no-multi-str": "error",
+        "no-native-reassign": "error",
+        "no-new": "error",
+        "no-new-func": "off",
+        "no-new-wrappers": "error",
+        "no-octal": "error",
+        "no-octal-escape": "error",
+        "no-param-reassign": "off",
+        "no-process-env": "error",
+        "no-proto": "error",
+        "no-redeclare": "error",
+        "no-return-assign": "error",
+        "no-script-url": "error",
+        "no-self-compare": "error",
+        "no-sequences": "error",
+        "no-throw-literal": "error",
+        "no-unused-expressions": "error",
+        "no-useless-call": "error",
+        "no-useless-concat": "error",
+        "no-void": "error",
+        "no-warning-comments": "off",
+        "no-with": "error",
+        "radix": "error",
+        "vars-on-top": "off",
+        "wrap-iife": "error",
+        "yoda": "error",
 
         // Variables
-        "init-declarations": 0,
-        "no-catch-shadow": 2,
-        "no-delete-var": 2,
-        "no-label-var": 2,
-        "no-shadow": 0,
-        "no-shadow-restricted-names": 2,
-        "no-undef": 2,
-        "no-undefined": 0,
-        "no-undef-init": 2,
-        "no-unused-vars": 2,
-        "no-use-before-define": 0,
+        "init-declarations": "off",
+        "no-catch-shadow": "error",
+        "no-delete-var": "error",
+        "no-label-var": "error",
+        "no-shadow": "off",
+        "no-shadow-restricted-names": "error",
+        "no-undef": "error",
+        "no-undefined": "off",
+        "no-undef-init": "error",
+        "no-unused-vars": "error",
+        "no-use-before-define": "off",
 
         // Stylistic
-        "array-bracket-spacing": 2,
-        "block-spacing": 2,
-        "brace-style": 2,
-        "camelcase": 2,
-        "comma-spacing": 2,
-        "comma-style": 2,
-        "computed-property-spacing": 2,
-        "consistent-this": 2,
-        "eol-last": 2,
-        "func-names": 0,
-        "func-style": 0,
-        "indent": [2, 2, {"SwitchCase": 1}],
-        "key-spacing": 0,
-        "keyword-spacing": 2,
-        "linebreak-style": 2,
-        "lines-around-comment": 0,
-        "new-cap": 0,
-        "newline-after-var": 0,
-        "new-parens": 2,
-        "no-array-constructor": 2,
-        "no-continue": 0,
-        "no-inline-comments": 0,
-        "no-lonely-if": 2,
-        "no-mixed-spaces-and-tabs": 2,
-        "no-multiple-empty-lines": 2,
-        "no-nested-ternary": 0,
-        "no-new-object": 2,
-        "no-spaced-func": 2,
-        "no-ternary": 0,
-        "no-trailing-spaces": 2,
-        "no-underscore-dangle": 0,
-        "no-unneeded-ternary": 2,
-        "object-curly-spacing": [1, "always"],
-        "one-var": 0,
-        "operator-assignment": 2,
-        "operator-linebreak": 0,
-        "padded-blocks": 0,
-        "quote-props": [2, "as-needed"],
-        "quotes": [2, "single"],
-        "semi": [2, "never"],
-        "semi-spacing": 2,
-        "sort-vars": 2,
-        "space-before-blocks": 2,
-        "space-before-function-paren": 0,
-        "spaced-comment": 2,
-        "space-infix-ops": 2,
-        "space-in-parens": 2,
-        "space-unary-ops": 2,
+        "array-bracket-spacing": "error",
+        "block-spacing": "error",
+        "brace-style": "error",
+        "camelcase": "error",
+        "comma-spacing": "error",
+        "comma-style": "error",
+        "computed-property-spacing": "error",
+        "consistent-this": "error",
+        "eol-last": "error",
+        "func-names": "off",
+        "func-style": "off",
+        "indent": ["error", 2, {"SwitchCase": 1}],
+        "key-spacing": "off",
+        "keyword-spacing": "error",
+        "linebreak-style": "error",
+        "lines-around-comment": "off",
+        "new-cap": "off",
+        "newline-after-var": "off",
+        "new-parens": "error",
+        "no-array-constructor": "error",
+        "no-continue": "off",
+        "no-inline-comments": "off",
+        "no-lonely-if": "error",
+        "no-mixed-spaces-and-tabs": "error",
+        "no-multiple-empty-lines": "error",
+        "no-nested-ternary": "off",
+        "no-new-object": "error",
+        "no-spaced-func": "error",
+        "no-ternary": "off",
+        "no-trailing-spaces": "error",
+        "no-underscore-dangle": "off",
+        "no-unneeded-ternary": "error",
+        "object-curly-spacing": ["warn", "always"],
+        "one-var": "off",
+        "operator-assignment": "error",
+        "operator-linebreak": "off",
+        "padded-blocks": "off",
+        "quote-props": ["error", "as-needed"],
+        "quotes": ["error", "single"],
+        "semi": ["error", "never"],
+        "semi-spacing": "error",
+        "sort-vars": "error",
+        "space-before-blocks": "error",
+        "space-before-function-paren": "off",
+        "spaced-comment": "error",
+        "space-infix-ops": "error",
+        "space-in-parens": "error",
+        "space-unary-ops": "error",
 
         // es6
-        "arrow-parens": 2,
-        "arrow-spacing": 2,
-        "constructor-super": 2,
-        "generator-star-spacing": 2,
-        "no-class-assign": 2,
-        "no-const-assign": 2,
-        "no-dupe-class-members": 2,
-        "no-new-symbol": 2,
-        "no-this-before-super": 2,
-        "no-var": 2,
-        "object-shorthand": 2,
-        "prefer-arrow-callback": 2,
-        "prefer-const": 0,
-        "prefer-reflect": 0,
-        "prefer-spread": 2,
-        "prefer-template": 2,
-        "require-yield": 2
+        "arrow-parens": "error",
+        "arrow-spacing": "error",
+        "constructor-super": "error",
+        "generator-star-spacing": "error",
+        "no-class-assign": "error",
+        "no-const-assign": "error",
+        "no-dupe-class-members": "error",
+        "no-new-symbol": "error",
+        "no-this-before-super": "error",
+        "no-var": "error",
+        "object-shorthand": "error",
+        "prefer-arrow-callback": "error",
+        "prefer-const": "off",
+        "prefer-reflect": "off",
+        "prefer-spread": "error",
+        "prefer-template": "error",
+        "require-yield": "error"
 
     }
 }
diff --git a/package.json b/package.json
index f8e4141489..28df1b3468 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "autoprefixer": "^6.0.3",
     "babel-eslint": "^6.0.4",
-    "eslint": "^2.2.0",
+    "eslint": "^2.3.0",
     "grunt": "^0.4.5",
     "grunt-babel": "^5.0.3",
     "grunt-build-control": "^0.6.0",