Merge branch 'master' into refactor-folders

* master:
  - Build: Update - Linting: Update to-do - Linting: Disable console inline for now to get CI passing - npm: Update devDeps.

# Conflicts:
#	src/common/units.js

package.json

@@ -126,12 +126,12 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.10.4",
-    "@babel/node": "^7.10.4",
+    "@babel/core": "^7.10.5",
+    "@babel/node": "^7.10.5",
     "@babel/plugin-transform-modules-commonjs": "^7.10.4",
     "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
     "@babel/preset-env": "^7.10.4",
-    "@babel/register": "^7.10.4",
+    "@babel/register": "^7.10.5",
     "@cypress/code-coverage": "^3.8.1",
     "@cypress/fiddle": "^1.18.2",
     "@fintechstudios/eslint-plugin-chai-as-promised": "^3.0.2",