Merge branch 'master' of https://github.com/trolleysolingen/Trolleyplanung

Conflicts:
	.idea/workspace.xml
	app/tmp/cache/models/myapp_cake_model_default_trolleyplanung_congregations
	app/tmp/cache/models/myapp_cake_model_default_trolleyplanung_list
	app/tmp/cache/models/myapp_cake_model_default_trolleyplanung_publishers
	app/tmp/cache/models/myapp_cake_model_default_trolleyplanung_reservations
	app/tmp/cache/models/myapp_cake_model_default_trolleyplanung_roles
	app/tmp/cache/models/myapp_cake_model_default_trolleyplanung_timeslots
	app/tmp/cache/persistent/myapp_cake_core_cake_de-de
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache