Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Entwicklung/source/data/db/db.js