merged calendar into dev
merged calendar into dev

chrisma/event-und-raumplanung,chrisma/event-und-raumplanung,chrisma/event-und-raumplanung,hpi-swt2/event-und-raumplanung,hpi-swt2/event-und-raumplanung