gui : working on multiplayer lobby #2
Merge remote-tracking branch 'origin/raie-zo' into gui

Conflicts:
	src/fr/miage/atlantis/gui/controllers/GuiController.java
gui : working on multiplayer lobby #3
gui : updating player name on connect
Merge remote-tracking branch 'origin/gui' into raie-zo