getFormEntities service fixed.
Merge https://github.com/UCLAlexMartin/Charityware

Conflicts:
	CharityWare_Server/build/classes/RESTCharityClient/UserClient.class
	CharityWare_Server/build/classes/RESTClient/UserClient$1.class
	CharityWare_Server/build/classes/RESTClient/UserClient$2.class
	CharityWare_Server/build/classes/charityHibernateEntities/FormFields.class
	CharityWare_Server/build/classes/charityHibernateManagers/UserManager.class
	CharityWare_Server/build/classes/sharedHibernateResources/ConnectionManager.class