Server client optimazation for joining and starting
Merge branch 'master' of https://github.com/Dushoom/shoot_me_if_you_can