modified:   infoCursos/WebContent/cadastroEstado.xhtml
	deleted:    infoCursos/src/main/webapp/META-INF/MANIFEST.MF
	deleted:    infoCursos/src/main/webapp/WEB-INF/web.xml
	deleted:    infoCursos/src/main/webapp/cadastroEstado.xhtml
	deleted:    infoCursos/src/main/webapp/index.jsp
	deleted:    infoCursos/src/main/webapp/template.xhtml
	deleted:    infoCursos/src/main/webapp/teste.xhtml
	deleted:    infoCursos/src/main/webapp/testePaginaJSF.xhtml
Merge branch 'master' of https://github.com/aulas/ProgramacaoIV

Conflicts:
	infoCursos/src/main/webapp/cadastroEstado.xhtml
	infoCursos/src/main/webapp/cadastroUsuario.xhtml
	infoCursos/src/main/webapp/template.xhtml

	new file:   infoCursos/.metadata/WebContent/WEB-INF/faces-config.pageflow
	modified:   infoCursos/.project
	new file:   infoCursos/.settings/de.loskutov.FileSync.prefs
	new file:   infoCursos/.settings/org.eclipse.ltk.core.refactoring.prefs
	modified:   infoCursos/.settings/org.eclipse.wst.common.component
	new file:   infoCursos/.settings/org.eclipse.wst.ws.service.policy.prefs
	deleted:    infoCursos/WebContent/META-INF/MANIFEST.MF
	deleted:    infoCursos/WebContent/WEB-INF/faces-config.xml
	deleted:    infoCursos/WebContent/WEB-INF/web.xml
	deleted:    infoCursos/WebContent/index.jsp
	deleted:    infoCursos/WebContent/template.xhtml
	deleted:    infoCursos/WebContent/teste.xhtml
	deleted:    infoCursos/WebContent/testePaginaJSF.xhtml
	modified:   infoCursos/src/main/java/br/edu/unoesc/model/Usuario.java
	new file:   infoCursos/src/main/webapp/blank.gif
	renamed:    infoCursos/WebContent/cadastroEstado.xhtml -> infoCursos/src/main/webapp/cadastroEstado.xhtml
	new file:   infoCursos/src/main/webapp/cadastroUsuario.xhtml
	new file:   infoCursos/src/main/webapp/iecss.css
	new file:   infoCursos/src/main/webapp/images/Thumbs.db
	new file:   infoCursos/src/main/webapp/images/bann1.jpg
	new file:   infoCursos/src/main/webapp/images/bann2.jpg
	new file:   infoCursos/src/main/webapp/images/banner728.jpg
	new file:   infoCursos/src/main/webapp/images/bar_bg.gif
	new file:   infoCursos/src/main/webapp/images/bg.jpg
	new file:   infoCursos/src/main/webapp/images/big_pic.jpg
	new file:   infoCursos/src/main/webapp/images/criar-site.jpg
	new file:   infoCursos/src/main/webapp/images/de.gif
	new file:   infoCursos/src/main/webapp/images/en.gif
	new file:   infoCursos/src/main/webapp/images/footer_bg.gif
	new file:   infoCursos/src/main/webapp/images/footer_logo.png
	new file:   infoCursos/src/main/webapp/images/header_bg.jpg
	new file:   infoCursos/src/main/webapp/images/link_bg.gif
	new file:   infoCursos/src/main/webapp/images/logo.png
	new file:   infoCursos/src/main/webapp/images/menu_bg.gif
	new file:   infoCursos/src/main/webapp/images/menu_divider.gif
	new file:   infoCursos/src/main/webapp/images/menu_title_bg.gif
	new file:   infoCursos/src/main/webapp/images/navbullet.png
	new file:   infoCursos/src/main/webapp/images/p1.jpg
	new file:   infoCursos/src/main/webapp/images/p1.png
	new file:   infoCursos/src/main/webapp/images/p2.jpg
	new file:   infoCursos/src/main/webapp/images/p3.jpg
	new file:   infoCursos/src/main/webapp/images/p4.jpg
	new file:   infoCursos/src/main/webapp/images/p5.jpg
	new file:   infoCursos/src/main/webapp/images/p6.jpg
	new file:   infoCursos/src/main/webapp/images/p7.jpg
	new file:   infoCursos/src/main/webapp/images/payment.gif
	new file:   infoCursos/src/main/webapp/images/shoppingcart.png
	new file:   infoCursos/src/main/webapp/images/slider_bg.gif
	new file:   infoCursos/src/main/webapp/images/thumb1.jpg
	new file:   infoCursos/src/main/webapp/images/thumb2.jpg
	new file:   infoCursos/src/main/webapp/js/boxOver.js
	new file:   infoCursos/src/main/webapp/style.css
	new file:   infoCursos/src/main/webapp/template.xhtml
	new file:   infoCursos/target/.classpath
	new file:   infoCursos/target/.project
	new file:   infoCursos/target/.settings/.jsdtscope
	new file:   infoCursos/target/.settings/de.loskutov.FileSync.prefs
	new file:   infoCursos/target/.settings/org.eclipse.jdt.core.prefs
	new file:   infoCursos/target/.settings/org.eclipse.wst.common.component
	new file:   infoCursos/target/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
	new file:   infoCursos/target/.settings/org.eclipse.wst.common.project.facet.core.xml
	new file:   infoCursos/target/.settings/org.eclipse.wst.jsdt.ui.superType.container
	new file:   infoCursos/target/.settings/org.eclipse.wst.jsdt.ui.superType.name
	new file:   infoCursos/target/.settings/org.maven.ide.eclipse.prefs
	modified:   infoCursos/target/classes/br/edu/unoesc/model/Usuario.class
	new file:   prototipo/cadastroUsuario.bmml
	new file:   prototipo/cadastroUsuario.png
	new file:   prototipo/cadastroUsuario.xml
Merge branch 'master' of https://github.com/aulas/ProgramacaoIV
Merge branch 'master' of https://github.com/aulas/ProgramacaoIV
	modified:   infoCursos/.settings/org.eclipse.wst.common.component
	deleted:    infoCursos/target/.classpath
	deleted:    infoCursos/target/.project
	deleted:    infoCursos/target/.settings/.jsdtscope
	deleted:    infoCursos/target/.settings/de.loskutov.FileSync.prefs
	deleted:    infoCursos/target/.settings/org.eclipse.jdt.core.prefs
	deleted:    infoCursos/target/.settings/org.eclipse.wst.common.component
	deleted:    infoCursos/target/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
	deleted:    infoCursos/target/.settings/org.eclipse.wst.common.project.facet.core.xml
	deleted:    infoCursos/target/.settings/org.eclipse.wst.jsdt.ui.superType.container
	deleted:    infoCursos/target/.settings/org.eclipse.wst.jsdt.ui.superType.name
	deleted:    infoCursos/target/.settings/org.maven.ide.eclipse.prefs
	modified:   infoCursos/target/classes/META-INF/persistence.xml
	modified:   infoCursos/target/classes/br/edu/unoesc/model/Curso.class
	modified:   infoCursos/target/classes/br/edu/unoesc/model/Usuario.class
	deleted:    infoCursos/target/infoCursos.war
	deleted:    infoCursos/target/infoCursos/META-INF/MANIFEST.MF
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/META-INF/persistence.xml
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/managedBean/CategoriaMB.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/managedBean/EstadoMB.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/managedBean/SubCategoriaMB.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/managedBean/TesteMB.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Categoria.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Cidade.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Curso.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Destaque.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Empresa.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Estado.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/GenericModel.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Hotel.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Periodo.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Subcategoria.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Usuario.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/CategoriaService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/CidadeService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/CursoService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/DestaqueService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/EmpresaService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/EstadoService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/GenericServices.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/HotelService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/PeriodoService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/SubcategoriaService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/UsuarioService.class
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/conf.xml
	deleted:    infoCursos/target/infoCursos/WEB-INF/classes/persistence.xml
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/antlr-2.7.6.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/asm-3.1.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/cglib-2.2.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/commons-collections-3.1.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/dom4j-1.6.1.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/hibernate-annotations-3.5.4-Final.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/hibernate-annotations-3.5.6-Final.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/hibernate-commons-annotations-3.2.0.Final.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/hibernate-core-3.5.4-Final.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/hibernate-core-3.5.6-Final.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/hibernate-entitymanager-3.5.4-Final.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/hibernate-entitymanager-3.5.6-Final.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/hibernate-validator-4.2.0.Final.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/javassist-3.9.0.GA.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/javax.faces-2.1.7.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/jta-1.1.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/log4j-1.2.14.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/log4j-1.2.16.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/log4j-1.2.17.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/primefaces-3.2.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/slf4j-api-1.5.8.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/slf4j-api-1.6.1.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/slf4j-log4j12-1.6.1.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/slf4j-log4j12-1.6.6.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/validation-api-1.0.0.GA.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/lib/xml-apis-1.0.b2.jar
	deleted:    infoCursos/target/infoCursos/WEB-INF/web.xml
	deleted:    infoCursos/target/infoCursos/blank.gif
	deleted:    infoCursos/target/infoCursos/cadastroEstado.xhtml
	deleted:    infoCursos/target/infoCursos/cadastroUsuario.xhtml
	deleted:    infoCursos/target/infoCursos/iecss.css
	deleted:    infoCursos/target/infoCursos/images/Thumbs.db
	deleted:    infoCursos/target/infoCursos/images/bann1.jpg
	deleted:    infoCursos/target/infoCursos/images/bann2.jpg
	deleted:    infoCursos/target/infoCursos/images/banner728.jpg
	deleted:    infoCursos/target/infoCursos/images/bar_bg.gif
	deleted:    infoCursos/target/infoCursos/images/bg.jpg
	deleted:    infoCursos/target/infoCursos/images/big_pic.jpg
	deleted:    infoCursos/target/infoCursos/images/criar-site.jpg
	deleted:    infoCursos/target/infoCursos/images/de.gif
	deleted:    infoCursos/target/infoCursos/images/en.gif
	deleted:    infoCursos/target/infoCursos/images/footer_bg.gif
	deleted:    infoCursos/target/infoCursos/images/footer_logo.png
	deleted:    infoCursos/target/infoCursos/images/header_bg.jpg
	deleted:    infoCursos/target/infoCursos/images/link_bg.gif
	deleted:    infoCursos/target/infoCursos/images/logo.png
	deleted:    infoCursos/target/infoCursos/images/menu_bg.gif
	deleted:    infoCursos/target/infoCursos/images/menu_divider.gif
	deleted:    infoCursos/target/infoCursos/images/menu_title_bg.gif
	deleted:    infoCursos/target/infoCursos/images/navbullet.png
	deleted:    infoCursos/target/infoCursos/images/p1.jpg
	deleted:    infoCursos/target/infoCursos/images/p1.png
	deleted:    infoCursos/target/infoCursos/images/p2.jpg
	deleted:    infoCursos/target/infoCursos/images/p3.jpg
	deleted:    infoCursos/target/infoCursos/images/p4.jpg
	deleted:    infoCursos/target/infoCursos/images/p5.jpg
	deleted:    infoCursos/target/infoCursos/images/p6.jpg
	deleted:    infoCursos/target/infoCursos/images/p7.jpg
	deleted:    infoCursos/target/infoCursos/images/payment.gif
	deleted:    infoCursos/target/infoCursos/images/shoppingcart.png
	deleted:    infoCursos/target/infoCursos/images/slider_bg.gif
	deleted:    infoCursos/target/infoCursos/images/thumb1.jpg
	deleted:    infoCursos/target/infoCursos/images/thumb2.jpg
	deleted:    infoCursos/target/infoCursos/index.jsp
	deleted:    infoCursos/target/infoCursos/js/boxOver.js
	deleted:    infoCursos/target/infoCursos/style.css
	deleted:    infoCursos/target/infoCursos/template.xhtml
	deleted:    infoCursos/target/infoCursos/teste.xhtml
	deleted:    infoCursos/target/infoCursos/testePaginaJSF.xhtml
deleted:    infoCursos/target/maven-archiver/pom.properties
	deleted:    infoCursos/target/surefire/surefire1136805051762232224tmp
	deleted:    infoCursos/target/surefire/surefire1225659239346470552tmp
	deleted:    infoCursos/target/surefire/surefire1231535461897387987tmp
	deleted:    infoCursos/target/surefire/surefire1350857126785160907tmp
	deleted:    infoCursos/target/surefire/surefire1457482270762962282tmp
	deleted:    infoCursos/target/surefire/surefire2796524035569467788tmp
	deleted:    infoCursos/target/surefire/surefire286971557615165717tmp
	deleted:    infoCursos/target/surefire/surefire3874240694616123152tmp
	deleted:    infoCursos/target/surefire/surefire6167127957649169132tmp
	deleted:    infoCursos/target/surefire/surefire6932845442623054245tmp
	deleted:    infoCursos/target/surefire/surefire6960207256540214803tmp
	deleted:    infoCursos/target/surefire/surefire7123349614365711079tmp
	deleted:    infoCursos/target/surefire/surefire7572932815725310581tmp
	deleted:    infoCursos/target/surefire/surefire7741968256007999612tmp
	deleted:    infoCursos/target/surefire/surefire96348993251894753tmp
	deleted:    infoCursos/target/surefire/surefire969932454263062470tmp
Merge branch 'master' of https://github.com/aulas/ProgramacaoIV

Conflicts:
	infoCursos/target/classes/META-INF/persistence.xml
	infoCursos/target/classes/br/edu/unoesc/model/Curso.class
	infoCursos/target/classes/br/edu/unoesc/model/Usuario.class

	modified:   infoCursos/src/main/java/br/edu/unoesc/model/Categoria.java
	modified:   infoCursos/src/main/java/br/edu/unoesc/model/Subcategoria.java
	modified:   infoCursos/src/main/webapp/cadastroEstado.xhtml
	deleted:    infoCursos/target/classes/br/edu/unoesc/managedBean/CategoriaMB.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/managedBean/EstadoMB.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/managedBean/SubCategoriaMB.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/managedBean/TesteMB.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/model/Categoria.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/model/Cidade.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/model/Destaque.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/model/Empresa.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/model/Estado.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/model/GenericModel.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/model/Hotel.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/model/Periodo.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/model/Subcategoria.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/CategoriaService.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/CidadeService.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/CursoService.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/DestaqueService.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/EmpresaService.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/EstadoService.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/GenericServices.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/HotelService.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/PeriodoService.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/SubcategoriaService.class
	deleted:    infoCursos/target/classes/br/edu/unoesc/services/UsuarioService.class
	deleted:    infoCursos/target/classes/conf.xml
Alteracao no Template pelo Marcos