commiting the private properties<Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
reports build files <Bandile>
began work on AtMortuaryServlet <Bandile>
build file <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	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/nbproject/genfiles.properties
	Integrated Project/Gauteng MMS/src/java/servlets/AtSceneServlet.java
	Integrated Project/Gauteng MMS/web/RegisteredSamples.jsp
build files <Bandile>
deleted integrated copy <Bandile>
added my backup of Integrated Project <Bandile>
Adding correct BodyAddress fields <Bandile>
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/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/ReferenceListDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/web.xml
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
added atSceneBodyAddressCity field <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
deleted logoutservlet <Bandile>
general commit <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/src/java/servlets/AtMortuaryServlet.java
added two address fields to At Scene <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/src/java/servlets/AtMortuaryServlet.java
deleted atMortuary Servlet <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git