Signed-off-by: Asheen <sheensin@gmail.com>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/Admin.jsp
	Integrated Project/Gauteng MMS/build/web/BodyFileTabContent.jsp
	Integrated Project/Gauteng MMS/build/web/Home.jsp
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/EditUser.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Integrated Project/Gauteng MMS/web/Home.jsp
I fixed the bug that came up in the demo