Merge
Merge branch 'master' of https://github.com/jonathan0211/APPEmpreendedorismo

Conflicts:
	lastVersion/ClassesNegocio/dist/ClassesNegocio.jar
	lastVersion/SalvarInformacoes/build/built-jar.properties
	lastVersion/SalvarInformacoes/build/classes/tela/posto/NovoPosto.class
	lastVersion/SalvarInformacoes/nbproject/private/private.xml