Merge branch 'master' into dependabot/npm_and_yarn/jquery-tw-3.4.1

Author: davidlygagnon

package.json

@@ -23,7 +23,7 @@
     "express": "^4.13.1",
     "history": "^1.17.0",
     "jquery": "^3.4.1",
-    "react": "^0.14.1",
+    "react": "^16.8.6",
     "react-dom": "^0.14.7",
     "react-router": "^1.0.3",
     "webfontloader": "^1.6.21"
@@ -46,12 +46,12 @@
     "node-sass": "^4.5.3",
     "path": "^0.11.14",
     "react-hot-loader": "^1.2.8",
-    "resolve-url-loader": "^2.1.0",
+    "resolve-url-loader": "^3.1.0",
     "sass-loader": "^6.0.6",
     "sizzle": "^2.3.0",
     "string-replace-loader": "^1.0.0",
     "style-loader": "^0.12.3",
-    "url-loader": "^0.5.9",
+    "url-loader": "^1.1.2",
     "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1"
   }