Apply User geht wieder!
Merge branch 'master' of https://github.com/ankaufma/FAQ-Teamprojekt.git

Conflicts:
	FAQTP/server/RegisterOnServer.php