Kleine Änderungen
Conflicts:
	src/includes/Kategorien.php
Merge branch 'master' of https://github.com/lschwahn/MI-WebProg

Conflicts:
	src/includes/Kategorien.php