Update master repo

Pulled development both from Damien and Florent and pushed it into master repo.

Problem was in .gitsubmodules of server-game that was still referencing Damien's repo (this has been corrected last week, but we forgot to update the master repo too)