User management update
Merge branch 'master' of
https://github.com/EVRI-TEAM/Evri_Charity-Portal.git

Conflicts:
	WebContent/js/controllers.js
Merge branch 'master' of https://github.com/EVRI-TEAM/Evri_Charity-Portal.git
User update