reverted getFormFieldType()
Merge branch 'master' into hotfix
Updated Version 3.5.008
Merge branch 'master' into develop

Conflicts:
	version.txt