Update Datenbank
Merge remote-tracking branch 'origin/master'

Conflicts:
	Blutwurst1Wins/home/blutwurst/trash/hsql.properties
	Blutwurst1Wins/home/blutwurst/trash/hsql.script