working on Bewohner
Merge branch 'master' of https://github.com/dasimmet/SimPforte

Conflicts:
	res/settings.db