Update formHelper.php

fix merge conflict
remove old adminmanager
Merge master into manager

Conflicts:
	system/formHelper.php