Edit employee functionality
Edit user
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/classes/org/apache/jsp/CallDetailsContent_jsp.class
	Integrated Project/Gauteng MMS/build/generated/classes/org/apache/jsp/EditAdmin_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/generated/src/org/apache/jsp/CallDetailsContent_jsp.java
	Integrated Project/Gauteng MMS/build/generated/src/org/apache/jsp/EditAdmin_jsp.class.smap
	Integrated Project/Gauteng MMS/build/generated/src/org/apache/jsp/EditAdmin_jsp.java
	Integrated Project/Gauteng MMS/build/web/Admin.jsp
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/EditUser.class
	Integrated Project/Gauteng MMS/web/Admin.jsp
Body file merge
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git