Mudanças na tela de detalhes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/material/detalhesmaterial.scala.html