Update base_edit_form.html.twig
Manually apply https://github.com/sonata-project/SonataAdminBundle/pull/1202
fix a typo in german translation
Fix export option being hidden when no batch are defined
reorder batch field only if exists
add missing spaces
Merge branch '2.1'

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