First step to integrate the server into the client
Merge branch 'master' of https://github.com/bartvbl/CoopPuzzler.git