.
Merge remote-tracking branch 'origin/Framework' into Framework

Conflicts:
	projects/checkliste/data/log.db
	projects/checkliste/data/users.db
.