Login is now using jQuery for data validation.
build files
Updated log incidents pages
build files
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/LogInServlet.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Team1_Db/TestApp/build/classes/testapp/Incident.class
	Team1_Db/TestApp/build/classes/testapp/TestApp.class
	Team1_Db/TestApp/build/classes/testapp/VehicleDispatch.class
	Team1_Db/TestApp/build/classes/testapp/VehicleDispatchDb.class
	Team1_Db/TestApp/build/classes/testapp/deathCallDb.class
	Team1_Db/TestApp/nbproject/genfiles.properties
	Team1_Db/TestApp/src/testapp/Incident.java
	Team1_Db/TestApp/src/testapp/TestApp.java
	Team1_Db/TestApp/src/testapp/VehicleDispatch.java
	Team1_Db/TestApp/src/testapp/VehicleDispatchDb.java
	Team1_Db/TestApp/src/testapp/incidentDb.java
updated log incident datavalidation
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/Admin.jsp
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/LogInServlet.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/nbproject/project.properties
	Integrated Project/Gauteng MMS/src/java/database/ReferenceListDb.java
	Integrated Project/Gauteng MMS/web/Admin.jsp
	Team1_Db/TestApp/build/classes/testapp/Incident.class
	Team1_Db/TestApp/build/classes/testapp/TestApp.class
	Team1_Db/TestApp/build/classes/testapp/VehicleDispatch.class
	Team1_Db/TestApp/build/classes/testapp/VehicleDispatchDb.class
	Team1_Db/TestApp/src/testapp/TestApp.java
	Team1_Db/TestApp/src/testapp/VehicleDispatchDb.java