Modifié le UI general
Merge branch 'master' of https://github.com/bobbylavoie/projets6info

Conflicts:
	Workspace/Jack/src/com/sPirates/Jack/client/place/ClientPlaceManager.java

Merge conflit