consulta!
consulta aprimorada!

Signed-off-by: Antonio Rezene Neto <rezendeneto@live.com>
Merge branch 'master' of https://github.com/johntheo/ProjetoFinalWeb

Conflicts:
	Projeto Netbeans/trabalho-final/src/main/java/utfpr/persistence/controller/AlbumJpaController.java
	Projeto Netbeans/trabalho-final/src/main/webapp/WEB-INF/templates/layout.xhtml
	Projeto Netbeans/trabalho-final/target/classes/inscricao/config/version.properties
	Projeto Netbeans/trabalho-final/target/classes/musicmate/faces/mngbeans/ConsultaBean.class
	Projeto Netbeans/trabalho-final/target/classes/utfpr/persistence/controller/ArtistaJpaController.class
	Projeto Netbeans/trabalho-final/target/inscricao-jsf-2/WEB-INF/classes/inscricao/config/version.properties
	Projeto Netbeans/trabalho-final/target/inscricao-jsf-2/WEB-INF/templates/layout.xhtml
	Projeto Netbeans/trabalho-final/target/inscricao-jsf-2/WEB-INF/web.xml
	Projeto Netbeans/trabalho-final/target/inscricao-jsf-2/cadastro.xhtml
	Projeto Netbeans/trabalho-final/target/inscricao-jsf-2/consulta.xhtml
	Projeto Netbeans/trabalho-final/target/maven-archiver/pom.properties