Data no formato br
Merge branch 'master' of https://github.com/HamiltonSantos/TCC.git

Conflicts:
	Desenvolvimento/workspace/src/main/webapp/WEB-INF/views/home.jsp
	Desenvolvimento/workspace/src/main/webapp/WEB-INF/views/paciente/mostra.jsp