Merging Hibernate Managers, Entities and Restful Clients
Merge branch 'master' of https://github.com/UCLAlexMartin/Charityware

Conflicts:
	CharityWare_Server/src/RESTSystemClient/UserClient.java