Merge branch 'dev' into dev_client
commit pourri
suppression du serveur de branch client
Merge branch 'dev_client' of https://github.com/JavaClientServer/JavaServeurClient into dev_test_merged

Conflicts:
	src/client/Client.java
Merge branch 'dev_test_merged' of https://github.com/JavaClientServer/JavaServeurClient into dev_test_merged

Conflicts:
	src/client/Client.java
	src/server/Server.java
completion package message