teste de novo
Merge branch 'master' of https://github.com/luizdona/cpa.git

Conflicts:
	cpa/src/META-INF/persistence.xml