DB erweitet, angepasst...
Merge branch 'tomerge' into tcp