Merge origin/master

Conflicts:
	src/main/java/br/com/munif/masterfinance2/aplicacao/Programa.java