Merge branch 'develop' into master

Author: tjmonsi

package-lock.json

@@ -94,7 +94,7 @@
     "eslint-config-standard": "11.0.0-beta.0",
     "eslint-plugin-chai-friendly": "0.4.1",
     "eslint-plugin-html": "4.0.2",
-    "eslint-plugin-import": "2.8.0",
+    "eslint-plugin-import": "2.10.0",
     "eslint-plugin-mocha": "5.0.0",
     "eslint-plugin-node": "6.0.1",
     "eslint-plugin-promise": "3.6.0",