Changed GautengMMS folder
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/generated/classes/org/apache/jsp/Admin_jsp.class
	Integrated Project/Gauteng MMS/build/generated/src/org/apache/jsp/Admin_jsp.class.smap
	Integrated Project/Gauteng MMS/build/generated/src/org/apache/jsp/Admin_jsp.java
	Integrated Project/Gauteng MMS/build/web/KinInformantDetailsContent.jsp
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/BodyDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/IncidentDb.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/nbproject/project.properties
	Integrated Project/Gauteng MMS/src/java/servlets/SaveKinDetailsServlet.java
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Integrated Project/Gauteng MMS/web/KinInformantDetailsContent.jsp
	Integrated Project/Gauteng MMS/web/js/KinDetailScript.js
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git