Merge branch 'master' into feature/add-communities-page

diff --cc app/views/layouts/_header.html.erb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc package.json
index bf8881668482a79c684374f006282cb915f528bf,5a50c3c21ddae14a1185d4f402fe2c8ec5ccbf86..944ac1ba9d2bc014fe6ba6b83b7c19cd80feee24
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -6,9 -6,7 +6,8 @@@
      "jquery-simulate": "^1.0.2",
      "js-cookie": "^3.0.0",
      "leaflet": "^1.6.0",
-     "leaflet.locatecontrol": "^0.74.0",
+     "leaflet.locatecontrol": "^0.75.0",
 +    "osm-community-index": "^5.1.3",
      "qs": "^6.9.4"
    },
    "devDependencies": {

diff --cc yarn.lock
Simple merge