merge new changes from main

frontend/package.json

@@ -9,8 +9,6 @@
     "@material-ui/core": "^3.6.0",
     "@material-ui/icons": "^3.0.1",
     "axios": "^0.18.0",
-    "babel-eslint": "9.0.0",
-    "eslint-plugin-react": "^7.11.1",
     "history": "^4.7.2",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
@@ -42,7 +40,6 @@
   },
   "devDependencies": {
     "cypress": "^3.8.3",
-    "eslint": "6.7.0",
     "husky": "^1.2.0"
   },
   "husky": {