did not complete editing of receive body
<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/src/java/servlets/EditAtSceneDetails.java
build files
<Bandile>