Merge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into...