Update user and group management
Merge branch 'master' of
https://github.com/EVRI-TEAM/Evri_Charity-Portal.git

Conflicts:
	WebContent/portal.html