Merge branch 'master' of https://github.com/UCLAlexMartin/Charityware

Conflicts:
	CharityWare_Server/build/classes/charityHibernateEntities/AccessLog.hbm.xml
Merge branch 'master' of https://github.com/UCLAlexMartin/Charityware

Conflicts:
	CharityWare_Server/build/classes/charityHibernateEntities/MailingGroup.hbm.xml
	CharityWare_Server/src/RESTSystemServices/CharityService.java
Last version of code
New version of code