waiting list feature added
Merge branch 'dev-waitinglist' into fork-christian