Accounteinstellungen (Pfuschi Design pls) ;)
Merge branch 'master' into dev2

Conflicts:
	settings/index.php