refactored controller() method of BaseController to getController() to avoid confusion between method and variable names
Merge branch 'master' of https://github.com/PauloGandraSousa/MyGitTest

Conflicts:
	eapli.expensemanager/src/eapli/expensemanager/presentation/RegisterExpenseUI.java