Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/home_controller.rb
	config/routes.rb