Première mise à jour : problème communication cluster (v1.1)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/client/model/ClientManager.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/client/model/ClientManager.java
petit correctif