Präsentation vorbereitet
Merge remote-tracking branch 'max/master'

Conflicts:
	src/sources/maps/Info_Ebene1_test.map
dos2unix
Merge branch 'master' into studiengang