Merge branch 'develop' into dependabot/npm_and_yarn/material-ui/styles-4.11.2

Author: UnsungHero97

package-lock.json

@@ -67,7 +67,7 @@
     "babel-plugin-transform-imports": "~2.0.0",
     "enzyme": "~3.11.0",
     "enzyme-adapter-react-16": "~1.15.0",
-    "eslint": "~7.14.0",
+    "eslint": "~7.15.0",
     "eslint-config-airbnb": "~18.2.0",
     "eslint-import-resolver-webpack": "~0.13.0",
     "eslint-loader": "~4.0.0",