big mise à jour!
Merge branch 'master' of https://github.com/MaxRoberti/boxit.git

Conflicts:
	src/com/boxit/core/Client.java