made changes
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/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Integrated Project/Gauteng MMS/web/OpenBodyFileContent.jsp
mades changes to kindb and servlets
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/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Integrated Project/Gauteng MMS/web/DeceasedDetailsContent.jsp
	Integrated Project/Gauteng MMS/web/OpenBodyFileContent.jsp
lol
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/build/web/WEB-INF/web.xml
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java

Signed-off-by: chester314 <200935415@student.uj.ac.za>
lol2
ICD10DB