meio que arrumei alguma coisa
oye!

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

Conflicts:
	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/inscricao-jsf-2.war
	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/classes/musicmate/faces/mngbeans/ConsultaBean.class
	Projeto Netbeans/trabalho-final/target/inscricao-jsf-2/WEB-INF/templates/layout.xhtml
	Projeto Netbeans/trabalho-final/target/inscricao-jsf-2/consulta.xhtml
	Projeto Netbeans/trabalho-final/target/maven-archiver/pom.properties

Signed-off-by: Antonio Rezene Neto <rezendeneto@live.com>
arrumar a pagina de layout.xhtml de acordo com as propriedades que deveriam existir em ConsultaBean!