CSS Changes
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/Admin.jsp
	Integrated Project/Gauteng MMS/build/web/EditBodyFileTabContent.jsp
	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/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/nbproject/project.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Integrated Project/Gauteng MMS/web/EditBodyFileTabContent.jsp
CSS
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/EditBodyFileTabContent.jsp
	Integrated Project/Gauteng MMS/build/web/Home.jsp
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/nbproject/genfiles.properties
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/nbproject/project.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Integrated Project/Gauteng MMS/web/DeceasedDetailsContent.jsp
	Integrated Project/Gauteng MMS/web/EditBodyFileTabContent.jsp
	Integrated Project/Gauteng MMS/web/Home.jsp
	Integrated Project/Gauteng MMS/web/IncidentDetailsContent.jsp
Changes to the CSS
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Integrated Project/Gauteng MMS/web/OpenBodyFileContent.jsp
Signed-off-by: TasneemJeena <tasneemjeena@yahoo.com>