UserManager fixed
Merge branch 'master' of https://github.com/UCLAlexMartin/Charityware
Merging of implemented old REST services
Merge branch 'master' of https://github.com/UCLAlexMartin/Charityware

Conflicts:
	CharityWare_Server/build/classes/systemHibernateEntities/User.class