Merge origin/master

Conflicts:
	app/controllers/Application.java