Merge branch 'sonata_type_buttons' into c_prod

Conflicts:
	Resources/doc/reference/form_field_definition.rst