Alterações finais
Merge branch 'master' of https://github.com/helton-hcs/Incomex

Conflicts:
	Incomex/nbproject/build-impl.xml
	Incomex/nbproject/genfiles.properties
	Incomex/nbproject/private/private.properties
	Incomex/nbproject/project.properties
	Incomex/nbproject/project.xml
	Incomex/src/com/hcs/incomex/povoadores/PovoadorUsuario.java
	Incomex/test/com/hcs/incomex/lacunas/testes/TesteGeradorDeData.java