Merge branch 'rebirth' of https://gitlab.coko.foundation/simplej/simplej into rebirth

package.json

@@ -16,6 +16,7 @@
     "@babel/core": "^7.0.0",
     "@pubsweet/base-model": "^3.5.0",
     "@pubsweet/coko-theme": "5.1.16",
+    "@pubsweet/component-password-reset-client": "^3.1.16",
     "@pubsweet/job-xsweet": "^2.0.3",
     "@pubsweet/model-team": "^2.1.4",
     "@pubsweet/model-user": "^5.1.4",
@@ -72,13 +73,13 @@
     "@babel/plugin-proposal-throw-expressions": "^7.0.0",
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/plugin-syntax-import-meta": "^7.0.0",
-    "babel-plugin-styled-components": "1.10.3",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^23.4.2",
     "babel-loader": "^8.0.6",
+    "babel-plugin-styled-components": "1.10.3",
     "clean-webpack-plugin": "^0.1.17",
     "compression-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^4.0.1",