Updated log incident
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
Login works
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
Login works
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
login works
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Team1_Db/TestApp/src/testapp/IncidentDb.java
ligin works
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
Login works, loading reference lists works
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
log in works
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/WEB-INF/classes/database/AuditTrail.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/AuditTrailDb.class
	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/Organization.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/OrganizationDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/Vehicle.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/VehicleDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Team1_Db/TestApp/src/testapp/IncidentDb.java
login works
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
incident details is working, problem with call details
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/DeathCallDb.class
dispatch vehicle is not working
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Team1_Db/TestApp/build/classes/testapp/DeathCallDb.class
	Team1_Db/TestApp/src/testapp/IncidentDb.java