Merge branch 'master' into im-new-authorization-process

Conflicts:
	app/assets/stylesheets/modules/forms.sass
	app/controllers/application_controller.rb