route auto
Merge remote-tracking branch 'origin/activator' into activator

Conflicts:
	app/controllers/Application.java