Ambiente
Merge branch 'base_desenvolvimento'

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.m2e.core.prefs
	.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
	.settings/org.eclipse.wst.common.project.facet.core.xml
	pom.xml
	target/m2e-wtp/web-resources/META-INF/maven/br.com.digilogos/bierSoft/pom.properties
	target/m2e-wtp/web-resources/META-INF/maven/br.com.digilogos/bierSoft/pom.xml
ok
Configurado para gerar Metamodel do JPA automaticamente