commit
Merge branch 'master' of https://github.com/mstyger/ARGES

Conflicts:
	doc/Abfallkalender.docx