Work on server/client
Merge branch 'kevin' into sophie
GUI fixed && ...
GUI && ...