Merge test 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/application_controller.rb
Merge test 2