current work
Merge branch 'master' of https://github.com/FHB-Systemintegration/TravInfoRepo

Conflicts:
	Webseite/source/deployment/js/src/places.js
	Webseite/source/deployment/js/src/weather.js
Merge branch 'master' of https://github.com/FHB-Systemintegration/TravInfoRepo
Wetter-Widget ohne Wetter-icons