angepasst.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controller/ActionsController.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
confirm passt start,ende, bookedtill und status an