Config angepasst
Merge branch 'master' of github.com:romanthomas/test

Conflicts:
	config.php