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

diff --cc app/abilities/ability.rb
Simple merge

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

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

diff --cc config/routes.rb
Simple merge

diff --cc yarn.lock
Simple merge