dispatch vehicle is still not working
dispatch vehicle is not working
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/generated/classes/org/apache/jsp/Home_jsp.class
	Integrated Project/Gauteng MMS/build/generated/classes/org/apache/jsp/IncidentDetailsContent_jsp.class
	Integrated Project/Gauteng MMS/build/generated/classes/org/apache/jsp/IncidentsTabContent_jsp.class
	Integrated Project/Gauteng MMS/build/generated/src/org/apache/jsp/Home_jsp.class.smap
	Integrated Project/Gauteng MMS/build/generated/src/org/apache/jsp/Home_jsp.java
	Integrated Project/Gauteng MMS/build/web/Admin.jsp
	Integrated Project/Gauteng MMS/build/web/EditAdmin.jsp
	Integrated Project/Gauteng MMS/build/web/Home.jsp
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/DeathCallDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/EmployeeDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/IncidentDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/IncidentMessageDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/ReferenceListDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/EditUser.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Handler.class
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/nbproject/project.properties
updated open incidents table
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
updated close incident