Testes cadastro de Estado
Merge branch 'master' of https://github.com/aulas/ProgramacaoIV

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

	modified:   infoCursos/.project
	new file:   infoCursos/.settings/de.loskutov.FileSync.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/cadastroEstado.xhtml
	deleted:    infoCursos/WebContent/index.jsp
	deleted:    infoCursos/WebContent/template.xhtml
	deleted:    infoCursos/WebContent/teste.xhtml
	deleted:    infoCursos/WebContent/testePaginaJSF.xhtml
	new file:   infoCursos/src/main/webapp/blank.gif
	modified:   infoCursos/src/main/webapp/cadastroEstado.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
	modified:   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
	deleted:    infoCursos/target/classes/META-INF/persistence.xml
	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/Curso.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/model/Usuario.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
	new file:   prototipo/cadastroUsuario.bmml
	new file:   prototipo/cadastroUsuario.png
	new file:   prototipo/cadastroUsuario.xml