Merge branch 'Grußformel-Feature'