APD-473: Revise Merkliste Entry
APD-473: "tralala" class removed
Merge branch 'APD-473' into develop