add placeholder for empty short description fields
Merge branch 'short_object_placeholder' into c_prod

Conflicts:
	Resources/doc/reference/form_field_definition.rst