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

Conflicts:
	app/reports/homenagem_simple.jasper
	app/views/homenagem/list.scala.html