Anpassung Datenschicht
Now there is a first runnable version
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	configure.php