act
"Correções"
Merge branch 'master' of https://github.com/mcneves/EAPLI_PL_2DG.git

Conflicts:
	eapli.ExpenseManager/src/Controllers/ExpenseTypeRegisterController.java
	eapli.ExpenseManager/src/Model/Expense.java
	eapli.ExpenseManager/src/Presentation/ExpenseRegisterUI.java
	eapli.ExpenseManager/src/Presentation/ExpenseTypeRegisterUI.java
	eapli.ExpenseManager/src/Presentation/IncomeTypeRegisterUI.java
	eapli.ExpenseManager/src/Presentation/MainMenu.java
	eapli.util/nbproject/private/private.properties