I made some updates
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/BodyDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
error
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
ReleaseBodyContent page has been ended (It not yet complete though)
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/BodyFileTabContent.jsp
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/AssistiveClasses/ClassSendMailTLS.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/BodyAtSceneDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/BodyDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/IncidentMessageDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/PostMortemDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/ReferenceListDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/VehicleDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/EditUser.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/dist/Gauteng_MMS.war
	Integrated Project/Gauteng MMS/nbproject/genfiles.properties
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java