Merge remote-tracking branch 'origin/folder'

Conflicts:
	app/controllers/Application.java
	conf/routes