...
Merge branch 'master' of github.com:attech/Einkaufs-Liste into dev

Conflicts:
	assets/data/version.dat
Updated Changelog.txt