Db
Merge branch 'master' of https://github.com/kathibr/die5gewinnt.git

Conflicts:
	db.properties