Test redeploying
Merge remote-tracking branch 'heroku/master'

Conflicts:
	app/controllers/Application.scala