Recommit formBody after conflict
Merge branch 'master' of https://github.com/NCIP/rembrandt

Conflicts:
	WebRoot/jsp/formBody.jsp
Changed reset() signature