build files <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
build files <Bandile>
using a tool to reference list <Bandile>
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
Changed database connector password
build files <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
general commit <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
general commit <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/DispatchVehicleContent.jsp
	Integrated Project/Gauteng MMS/web/DispatchVehicleContent.jsp
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
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
run files <Bandile>
Using tools for lists <Bandile>
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/servlets/Tools.class
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
Changed listing of ope incidents <Bandile>