Merge branch 'master' of github.com:hybrida/hybridaweb2-play

Conflicts:
	app/controllers/About.java