Alguns ajustes
Merge remote-tracking branch 'origin/master'

Conflicts:
	sigecon/WebContent/componentes/cadastro-cidade.jsp
	sigecon/WebContent/componentes/cadastro-paciente.jsp