intergrated project
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
%
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
Updated the sql query
Updated the sql query
Updated the sql query
Updated the sql query
Updated the sql query
Updated the sql query
Updated the sql query
Updated the sql query
Updated the sql query
Removed unused libraries
Removed unused libraries
Removed unused libraries
%
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	.gitignore
	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
	Reports/Reports_PDF_Monthly/src/Reports_PDF.java
fixed libraries referencing
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