Merge remote-tracking branch 'origin/master' into Dani
serverside groupbid
umbau hmac - derzeit auskommentiert
Merge branch 'Philipp'