Merge branch 'master' of https://github.com/aricomputacao/Atus

Conflicts:
	AtusModelo/src/br/com/atus/enumerated/Sexo.java
	AtusModelo/src/br/com/atus/modelo/Cliente.java
	AtusModelo/src/br/com/atus/modelo/Pessoa.java
	atus/src/java/br/com/atus/controller/CidadeController.java
	atus/src/java/br/com/atus/controller/UnidadeFederativaController.java
	atus/src/java/br/com/atus/dao/CidadeDAO.java
	atus/src/java/br/com/atus/dao/UnidadeFederativaDAO.java
	atus/src/java/br/com/atus/managedbean/ClienteMB.java
	atus/src/java/br/com/atus/managedbean/WebServiceMB.java
	atus/web/01/cliente.xhtml
	atus/web/home.xhtml
Merge branch 'master' of https://github.com/aricomputacao/Atus

Conflicts:
	AtusModelo/src/br/com/atus/enumerated/Sexo.java
	AtusModelo/src/br/com/atus/modelo/Cliente.java
	AtusModelo/src/br/com/atus/modelo/Pessoa.java
	atus/src/java/br/com/atus/controller/CidadeController.java
	atus/src/java/br/com/atus/controller/UnidadeFederativaController.java
	atus/src/java/br/com/atus/dao/CidadeDAO.java
	atus/src/java/br/com/atus/dao/UnidadeFederativaDAO.java
	atus/src/java/br/com/atus/managedbean/ClienteMB.java
	atus/src/java/br/com/atus/managedbean/WebServiceMB.java
	atus/web/01/cliente.xhtml
	atus/web/home.xhtml
Merge branch 'master' of https://github.com/aricomputacao/Atus

Conflicts:
	AtusModelo/src/br/com/atus/enumerated/Sexo.java
	AtusModelo/src/br/com/atus/modelo/Cliente.java
	AtusModelo/src/br/com/atus/modelo/Pessoa.java
	atus/src/java/br/com/atus/controller/CidadeController.java
	atus/src/java/br/com/atus/controller/UnidadeFederativaController.java
	atus/src/java/br/com/atus/dao/CidadeDAO.java
	atus/src/java/br/com/atus/dao/UnidadeFederativaDAO.java
	atus/src/java/br/com/atus/managedbean/ClienteMB.java
	atus/src/java/br/com/atus/managedbean/WebServiceMB.java
	atus/web/01/cliente.xhtml
	atus/web/home.xhtml
Merge branch 'master' of https://github.com/aricomputacao/Atus

Conflicts:
	AtusModelo/src/br/com/atus/enumerated/Sexo.java
	AtusModelo/src/br/com/atus/modelo/Cliente.java
	AtusModelo/src/br/com/atus/modelo/Pessoa.java
	atus/src/java/br/com/atus/controller/CidadeController.java
	atus/src/java/br/com/atus/controller/UnidadeFederativaController.java
	atus/src/java/br/com/atus/dao/CidadeDAO.java
	atus/src/java/br/com/atus/dao/UnidadeFederativaDAO.java
	atus/src/java/br/com/atus/managedbean/ClienteMB.java
	atus/src/java/br/com/atus/managedbean/WebServiceMB.java
	atus/web/01/cliente.xhtml
	atus/web/home.xhtml
Merge branch 'master' of https://github.com/aricomputacao/Atus

Conflicts:
	AtusModelo/src/br/com/atus/enumerated/Sexo.java
	AtusModelo/src/br/com/atus/modelo/Cliente.java
	AtusModelo/src/br/com/atus/modelo/Pessoa.java
	atus/src/java/br/com/atus/controller/CidadeController.java
	atus/src/java/br/com/atus/controller/UnidadeFederativaController.java
	atus/src/java/br/com/atus/dao/CidadeDAO.java
	atus/src/java/br/com/atus/dao/UnidadeFederativaDAO.java
	atus/src/java/br/com/atus/managedbean/ClienteMB.java
	atus/src/java/br/com/atus/managedbean/WebServiceMB.java
	atus/web/01/cliente.xhtml
	atus/web/home.xhtml
Merge branch 'master' of https://github.com/gilmario-kpslow/projetos

Conflicts:
	DocProject/ModeloDocProject/build/built-jar.properties
	DocProject/ModeloDocProject/build/classes/br/com/docproject/modelo/Capa.class
	DocProject/ModeloDocProject/build/classes/br/com/docproject/modelo/Conteudo.class
	DocProject/ModeloDocProject/build/classes/br/com/docproject/modelo/Historico.class
	DocProject/ModeloDocProject/build/classes/br/com/docproject/modelo/Manual.class
	DocProject/ModeloDocProject/build/classes/br/com/docproject/modelo/Pagina.class
	DocProject/ModeloDocProject/build/classes/br/com/docproject/modelo/Responsavel.class
	DocProject/ModeloDocProject/build/classes/br/com/docproject/modelo/Topico.class
	DocProject/ModeloDocProject/build/classes/relatorio/TestandoGeracaoManual.class
	DocProject/ModeloDocProject/dist/ModeloDocProject.jar
	DocProject/ModeloDocProject/dist/lib/antlr-2.7.7.jar
	DocProject/ModeloDocProject/dist/lib/dom4j-1.6.1.jar
	DocProject/ModeloDocProject/dist/lib/ehcache-core-2.4.3.jar
	DocProject/ModeloDocProject/dist/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
	DocProject/ModeloDocProject/dist/lib/javassist-3.15.0-GA.jar
	DocProject/ModeloDocProject/dist/lib/jboss-logging-3.1.0.GA.jar
	DocProject/ModeloDocProject/dist/lib/slf4j-api-1.6.1.jar
	DocProject/ModeloDocProject/nbproject/private/private.xml
	DocProject/ModeloDocProject/nbproject/project.properties
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/Capa.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/Conteudo.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/ConteudoPK.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/Historico.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/Manual.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/Pagina.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/PaginaPk.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/Sumario.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/TipoPagina.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/manual/Capa.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/manual/Conteudo.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/manual/ConteudoPK.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/manual/Historico.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/manual/Manual.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/manual/Pagina.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/manual/PaginaPk.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/manual/Sumario.java
	DocProject/ModeloDocProject/src/br/com/docproject/modelo/manual/TipoPagina.java
	DocProject/build/web/WEB-INF/classes/br/com/docproject/dao/CapaDAO.class
	DocProject/build/web/WEB-INF/classes/br/com/docproject/dao/ConteudoDAO.class
	DocProject/build/web/WEB-INF/classes/br/com/docproject/dao/ManualDAO.class
	DocProject/build/web/WEB-INF/classes/br/com/docproject/dao/PaginaDAO.class
	DocProject/lib/hibernate4-support/c3p0-0.9.2.1.jar
	DocProject/lib/hibernate4-support/hibernate-c3p0-4.2.6.Final.jar
	DocProject/lib/hibernate4-support/hibernate-commons-annotations-4.0.2.Final.jar
	DocProject/lib/hibernate4-support/hibernate-core-4.2.6.Final.jar
	DocProject/lib/hibernate4-support/hibernate-ehcache-4.2.6.Final.jar
	DocProject/lib/hibernate4-support/hibernate-entitymanager-4.2.6.Final.jar
	DocProject/lib/hibernate4-support/jboss-transaction-api_1.1_spec-1.0.1.Final.jar
	DocProject/lib/hibernate4-support/slf4j-simple-1.6.1.jar
	DocProject/nbproject/private/private.properties
	DocProject/nbproject/project.properties
	DocProject/src/java/hibernate.cfg.xml
	ModeloDocProject/src/br/com/docproject/modelo/Capa.java
	ModeloDocProject/src/br/com/docproject/modelo/Conteudo.java
	ModeloDocProject/src/br/com/docproject/modelo/ConteudoPK.java
	ModeloDocProject/src/br/com/docproject/modelo/Historico.java
	ModeloDocProject/src/br/com/docproject/modelo/Manual.java
	ModeloDocProject/src/br/com/docproject/modelo/Pagina.java
	ModeloDocProject/src/br/com/docproject/modelo/PaginaPk.java
	ModeloDocProject/src/br/com/docproject/modelo/Sumario.java
	ModeloDocProject/src/br/com/docproject/modelo/TipoPagina.java
	ModeloDocProject/src/br/com/docproject/modelo/Topico.java
	SistemaDocumentacao/nbproject/build-impl.xml
	SistemaDocumentacao/nbproject/genfiles.properties
	SistemaDocumentacao/nbproject/project.properties
	SistemaDocumentacao/nbproject/project.xml
	SistemaDocumentacao/src/conf/persistence.xml
	SistemaDocumentacao/src/java/dao/DAO.java
	SistemaDocumentacao/web/WEB-INF/web.xml
	SistemaDocumentacao/web/index.html
Ajustes
Ajustes