Merge fix
Merge branch 'develop' into mitgliederverwaltung

Conflicts:
	app/views/layouts/desktop.blade.php