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

Conflicts:
	src/br/edu/fatecriopreto/PersonalCash/util/Util.java