Merge origin/master

Conflicts:
	app/controllers/application_controller.rb