Merge branch 'master' of github.com:loomio/loomio into feature/error-rainchecks

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/application_controller.rb
	config/locales/en.yml