load User
Merge branch 'master' of https://github.com/HaSuDe/datenbanken

Conflicts:
	settings.php