Template
	modified:   java/META-INF/persistence.xml
	modified:   webapp/cadastros.xhtml
	modified:   ../../target/classes/META-INF/persistence.xml
	modified:   ../../target/infoCursos.war
	modified:   ../../target/infoCursos/WEB-INF/classes/META-INF/persistence.xml
	deleted:    ../../target/infoCursos/images/._footer_bg.gif
	deleted:    ../../target/infoCursos/images/._menu_bg.gif
	deleted:    ../../target/infoCursos/images/._menu_divider.gif
	deleted:    ../../target/infoCursos/images/._menu_title_bg.gif
	modified:   ../../target/infoCursos/images/de.gif
modified:   ../../target/infoCursos/images/en.gif
	modified:   ../../target/infoCursos/images/p1.jpg
	modified:   ../../target/infoCursos/style.css
	modified:   ../../target/infoCursos/template.xhtml
	modified:   ../../target/maven-archiver/pom.properties
	deleted:    ../../target/surefire/surefire1341680497842799646tmp
deleted:    ../../target/surefire/surefire1469537000676465417tmp
	deleted:    ../../target/surefire/surefire2306085718834076663tmp
	deleted:    ../../target/surefire/surefire236813911835907837tmp
	deleted:    ../../target/surefire/surefire2399571532843181727tmp
	deleted:    ../../target/surefire/surefire3596034431277512790tmp
	deleted:    ../../target/surefire/surefire4080400994201793195tmp
	deleted:    ../../target/surefire/surefire4206972210368362202tmp
deleted:    ../../target/surefire/surefire4569782142161709320tmp
	deleted:    ../../target/surefire/surefire4578403065039448846tmp
	deleted:    ../../target/surefire/surefire5706516235418738267tmp
	deleted:    ../../target/surefire/surefire6701778156226266870tmp
	deleted:    ../../target/surefire/surefire6741589803068894164tmp
	deleted:    ../../target/surefire/surefire6849836146685062784tmp
	deleted:    ../../target/surefire/surefire7172809907622671531tmp
	deleted:    ../../target/surefire/surefire7309356492015413591tmp
	deleted:    ../../target/surefire/surefire759060282741337125tmp
	deleted:    ../../target/surefire/surefire7827856908255650217tmp
	deleted:    ../../target/surefire/surefire8169562105790325295tmp
	deleted:    ../../target/surefire/surefire8606764616529580290tmp
	deleted:    ../../target/surefire/surefire8816337472455416104tmp
	deleted:    ../../target/surefire/surefire8839491935974569795tmp

	../../target/infoCursos/cadastros.xhtml
	../../target/surefire/
Merge branch 'master' of https://github.com/aulas/ProgramacaoIV

Conflicts:
	infoCursos/src/main/java/META-INF/persistence.xml
	infoCursos/src/main/webapp/template.xhtml
	infoCursos/target/classes/META-INF/persistence.xml
	infoCursos/target/infoCursos.war
	infoCursos/target/infoCursos/WEB-INF/classes/META-INF/persistence.xml
	infoCursos/target/infoCursos/images/de.gif
	infoCursos/target/infoCursos/images/en.gif
	infoCursos/target/infoCursos/images/p1.jpg
	infoCursos/target/infoCursos/style.css
	infoCursos/target/maven-archiver/pom.properties

	modified:   ../../.settings/org.eclipse.wst.common.component
	modified:   java/META-INF/persistence.xml
	new file:   java/br/edu/unoesc/managedBean/HotelMB.java
	new file:   webapp/cadastroHotel.xhtml
	renamed:    ../../target/infoCursos/index.xhtml -> webapp/detalhes.xhtml
	modified:   webapp/template.xhtml
	deleted:    ../../target/classes/br/edu/unoesc/converter/EstadoConverter.class
	deleted:    ../../target/classes/br/edu/unoesc/managedBean/CategoriaMB.class
	deleted:    ../../target/classes/br/edu/unoesc/managedBean/CidadeMB.class
	deleted:    ../../target/classes/br/edu/unoesc/managedBean/EstadoMB.class
	deleted:    ../../target/classes/br/edu/unoesc/managedBean/SubCategoriaMB.class
	deleted:    ../../target/classes/br/edu/unoesc/managedBean/TesteMB.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Categoria.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Cidade.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Curso.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Destaque.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Empresa.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Estado.class
	deleted:    ../../target/classes/br/edu/unoesc/model/GenericModel.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Hotel.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Periodo.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Subcategoria.class
	deleted:    ../../target/classes/br/edu/unoesc/model/Usuario.class
	deleted:    ../../target/classes/br/edu/unoesc/services/CategoriaService.class
	deleted:    ../../target/classes/br/edu/unoesc/services/CidadeService.class
	deleted:    ../../target/classes/br/edu/unoesc/services/CursoService.class
	deleted:    ../../target/classes/br/edu/unoesc/services/DestaqueService.class
	deleted:    ../../target/classes/br/edu/unoesc/services/EmpresaService.class
	deleted:    ../../target/classes/br/edu/unoesc/services/EstadoService.class
	deleted:    ../../target/classes/br/edu/unoesc/services/GenericServices.class
	deleted:    ../../target/classes/br/edu/unoesc/services/HotelService.class
	deleted:    ../../target/classes/br/edu/unoesc/services/PeriodoService.class
	deleted:    ../../target/classes/br/edu/unoesc/services/SubcategoriaService.class
	deleted:    ../../target/classes/br/edu/unoesc/services/UsuarioService.class
	deleted:    ../../target/classes/conf.xml
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/converter/EstadoConverter.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/managedBean/CategoriaMB.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/managedBean/CidadeMB.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/managedBean/EstadoMB.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/managedBean/SubCategoriaMB.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/managedBean/TesteMB.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Categoria.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Cidade.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Curso.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Destaque.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Empresa.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Estado.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/GenericModel.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Hotel.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Periodo.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Subcategoria.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/model/Usuario.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/CategoriaService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/CidadeService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/CursoService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/DestaqueService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/EmpresaService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/EstadoService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/GenericServices.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/HotelService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/PeriodoService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/SubcategoriaService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/br/edu/unoesc/services/UsuarioService.class
	deleted:    ../../target/infoCursos/WEB-INF/classes/conf.xml
	deleted:    ../../target/infoCursos/WEB-INF/lib/antlr-2.7.6.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/asm-3.1.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/cglib-2.2.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/commons-collections-3.1.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/dom4j-1.6.1.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/hibernate-annotations-3.5.4-Final.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/hibernate-commons-annotations-3.2.0.Final.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/hibernate-core-3.5.4-Final.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/hibernate-entitymanager-3.5.4-Final.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/hibernate-validator-4.2.0.Final.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/javassist-3.9.0.GA.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/javax.faces-2.1.7.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/jta-1.1.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/log4j-1.2.14.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/mysql-connector-java-5.1.10.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/primefaces-3.2.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/slf4j-api-1.5.8.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/slf4j-log4j12-1.5.8.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/validation-api-1.0.0.GA.jar
	deleted:    ../../target/infoCursos/WEB-INF/lib/xml-apis-1.0.b2.jar
	deleted:    ../../target/infoCursos/WEB-INF/web.xml
	deleted:    ../../target/infoCursos/blank.gif
	deleted:    ../../target/infoCursos/cadastroCidade.xhtml
	deleted:    ../../target/infoCursos/cadastroEstado.xhtml
	deleted:    ../../target/infoCursos/cadastroUsuario.xhtml
	deleted:    ../../target/infoCursos/iecss.css
	deleted:    ../../target/infoCursos/images/Thumbs.db
	deleted:    ../../target/infoCursos/images/aw.jpg
	deleted:    ../../target/infoCursos/images/bann1.jpg
	deleted:    ../../target/infoCursos/images/bann2.jpg
	deleted:    ../../target/infoCursos/images/banner728.jpg
	deleted:    ../../target/infoCursos/images/banner728.png
	deleted:    ../../target/infoCursos/images/bar_bg.gif
	deleted:    ../../target/infoCursos/images/bg.jpg
	deleted:    ../../target/infoCursos/images/big_pic.jpg
	deleted:    ../../target/infoCursos/images/criar-site.jpg
	deleted:    ../../target/infoCursos/images/footer_bg.gif
	deleted:    ../../target/infoCursos/images/footer_logo.png
	deleted:    ../../target/infoCursos/images/header_bg.jpg
	deleted:    ../../target/infoCursos/images/link_bg.gif
deleted:    ../../target/infoCursos/images/logo.png
	deleted:    ../../target/infoCursos/images/menu_bg.gif
	deleted:    ../../target/infoCursos/images/menu_divider.gif
	deleted:    ../../target/infoCursos/images/menu_title_bg.gif
	deleted:    ../../target/infoCursos/images/navbullet.png
	deleted:    ../../target/infoCursos/images/p1.png
	deleted:    ../../target/infoCursos/images/p2.jpg
	deleted:    ../../target/infoCursos/images/p3.jpg
	deleted:    ../../target/infoCursos/images/p4.jpg
	deleted:    ../../target/infoCursos/images/p5.jpg
	deleted:    ../../target/infoCursos/images/p6.jpg
	deleted:    ../../target/infoCursos/images/p7.jpg
	deleted:    ../../target/infoCursos/images/payment.gif
	deleted:    ../../target/infoCursos/images/shoppingcart.png
	deleted:    ../../target/infoCursos/images/slider_bg.gif
	deleted:    ../../target/infoCursos/images/thumb1.jpg
	deleted:    ../../target/infoCursos/images/thumb2.jpg
	deleted:    ../../target/infoCursos/js/boxOver.js
	deleted:    ../../target/infoCursos/template.xhtml

	webapp/template.xhtml~HEAD
	../../target/infoCursos/cadastros.xhtml
	../../target/surefire/
Template Boca