Merge branch 'master' of https://github.com/alexandreab/APBGCS

Conflicts:
	Desenvolvimento/Projeto/APB/.classpath
	Desenvolvimento/Projeto/APB/pom.xml
Merge branch 'master' of https://github.com/alexandreab/APBGCS