Merge branch 'master' of https://github.com/ajorgesantosp/EAPLI_PL_2DB.git

Conflicts:
	eapli.expensemanager/src/Controllers/ExpenseTypeController.java
	eapli.expensemanager/src/Presentation/RegisterPaymentMeanUI.java