Modifications to the web xml to include two servlets
Merge branch 'master' of https://github.com/UCLAlexMartin/Charityware

Conflicts:
	CharityWare_Server/build/classes/RESTCharityClient/UserClient.class
	CharityWare_Server/build/classes/charityHibernateEntities/FormFields.class
	CharityWare_Server/build/classes/charityHibernateEntities/User.class
	CharityWare_Server/build/classes/charityHibernateEntities/UserType.class
	CharityWare_Server/build/classes/charityHibernateManagers/UserManager.class
	CharityWare_Server/build/classes/sharedHibernateResources/ConnectionManager.class
	CharityWare_Server/build/classes/staticResources/websiteLogin.class
Reverted some changes to the user service that were using a redundant
solution.