Conclusão de duas tarefas
regular

Regular
Merge branch 'master' of https://github.com/shouts/PersonalCash

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties