better listing of Fachkombinationen
Merge branch 'master' of https://github.com/uol-studip/estudienplaner

Conflicts:
	controllers/zsb_studiengang.php