Merge pull request #522 from leider/master

Waitinglist UI now only with activity