a
Merge branch 'master' of https://github.com/stavrianosy/BudgetManagementAssistant

Conflicts:
	libraries/BMAServiceHost/web.config