Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/initializers/content_security_policy.rb
  (took our version)

package.json

@@ -138,7 +138,7 @@
     "react-notification": "^6.8.4",
     "react-overlays": "^0.8.3",
     "react-redux": "^7.1.0",
-    "react-redux-loading-bar": "^4.4.0",
+    "react-redux-loading-bar": "^4.0.8",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
     "react-select": "^2.4.4",