Hack fixes

Conflicts:
	php/classes/forms/Form.php