Add missing json type
    sonata_type buttons changes
Merge branch 'sonata_type_buttons' into c_prod

Conflicts:
	Resources/views/CRUD/edit_orm_one_to_many.html.twig