Merge branch 'Grußformel-Feature'
Merge branch 'master' into Grußformel-Feature