More security checks
Merge branch 'master' into design

Conflicts:
	src/FOM/UserBundle/Controller/GroupController.php
	src/FOM/UserBundle/Controller/UserController.php
	src/FOM/UserBundle/Resources/views/Group/actions.html.twig
	src/FOM/UserBundle/Resources/views/Group/index.html.twig
	src/FOM/UserBundle/Resources/views/User/form.html.twig
Merge branch 'design' of github.com:mapbender/fom into design

Conflicts:
	src/FOM/UserBundle/Controller/UserController.php
	src/FOM/UserBundle/Resources/views/Group/index.html.twig