merge conficts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "3.8.2",
+  "version": "3.9.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "private": true,
@@ -71,7 +71,6 @@
     "babel-preset-es2015": "6.24.1",
     "babel-preset-react": "^6.23.0",
     "bcryptjs": "^2.4.3",
-    "body-parser": "1.18.2",
     "bowser": "^1.7.2",
     "brotli-webpack-plugin": "^0.5.0",
     "cli-table": "^0.3.1",
@@ -153,6 +152,7 @@
     "react-mdl": "^1.11.0",
     "react-mdl-selectfield": "^0.2.0",
     "react-paginate": "^5.0.0",
+    "react-portal": "^4.1.2",
     "react-recaptcha": "^2.2.6",
     "react-redux": "^4.4.5",
     "react-router": "^3.0.0",
@@ -160,6 +160,7 @@
     "react-test-renderer": "15.5",
     "react-toastify": "^1.5.0",
     "react-transition-group": "^1.1.3",
+    "react-virtualized": "9.13.0",
     "recompose": "^0.23.1",
     "redux": "^3.6.0",
     "redux-thunk": "^2.1.0",