server-edited changes
Merge jaguar.kernetics.de:/var/www/waechterruf.de/web/typo3conf/ext/kit_sharedcalendar

Conflicts:
	Configuration/TypoScript/constants.txt
	Configuration/TypoScript/setup.txt
	Resources/Public/SharedCalendar.js