.
Merge branch 'master' of https://github.com/brunodecastro/homenagens

Conflicts:
	app/controllers/Homenagens.java
	app/views/homenagem/createForm.scala.html
	conf/evolutions/default/1.sql
	conf/initial-data.yml
Merge branch 'master' of https://github.com/brunodecastro/homenagens