custom fields improvement, trim s_options
Merge branch 'issue-customfields-trim' into develop

Conflicts:
	oc-admin/ajax/ajax.php