Merge remote-tracking branch 'upstream/master' into upstream-updates

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	app/assets/javascripts/app/popup-manager.js
	app/assets/javascripts/detail/detail-init.js
	app/assets/stylesheets/_base.scss.erb
	app/views/component/about/_contribute.html.haml
	app/views/component/locations/detail/_body.html.haml
	app/views/component/search/_map_data.html.haml
	config/application.example.yml
	spec/features/general/translate_spec.rb