commit
Merge branch 'master' of https://github.com/cactustecnologia/cadastros-base.git
arrumando
comitando
teste
Merge branch 'master' of
https://github.com/cactustecnologia/cadastros-base.git

Conflicts:
	.metadata/src/main/webapp/WEB-INF/faces-config.pageflow
	src/main/java/br/com/cactus/cadastros/controller/EstadoCivilBean.java
	src/main/java/br/com/cactus/cadastros/repository/EstadoCivis.java
	src/main/webapp/WEB-INF/template/LayoutPadrao.xhtml
	src/main/webapp/estadoCivil/CadastroEstadoCivil.xhtml