Merge origin/master

Conflicts:
	atus/src/conf/persistence.xml
	atus/web/02/processo.xhtml
	atus/web/resources/consultas/ProcessoConsulta.xhtml
Merge origin/master

Conflicts:
	atus/src/conf/persistence.xml
	atus/web/02/processo.xhtml
	atus/web/resources/consultas/ProcessoConsulta.xhtml