revert
merge
merge
Merge branch 'master' of https://github.com/Icepick/php_fachkompetenzen

Conflicts:
	abfragen.php
	profil.php
Merge branch 'master' of https://github.com/Icepick/php_fachkompetenzen

Conflicts:
	abfragen.php
	profil.php