atualizacoes
Merge branch 'master' of https://github.com/nandorodpires2/newfinances2

Conflicts:
	nbproject/private/private.xml