Rearranged list
Merge branch 'master' of github.com:Binaerpiloten/freizeitbooking-plattform

Conflicts:
	src/Binaerpiloten/FreizeitbookingPlattformBundle/Resources/views/base.html.twig