Merge branch 'dev_client' into dev_test_merged
Merge branch 'dev_serveur' into dev_test_merged
merge des deux branches pour test
Correction du serveur, externalisation des threads et ajout de doc
Correction erreur et externalisation de la reception
Correction inprogress pour le close
suppression client branch serveur
clean branch
Merge branch 'dev_client' of https://github.com/JavaClientServer/JavaServeurClient into dev_test_merged

Conflicts:
	src/client/Client.java
correction erreur a la fermeture client
Merge branch 'dev' of https://github.com/JavaClientServer/JavaServeurClient into dev

Conflicts:
	src/server/Server.java
Merge branch 'dev_serveur' of https://github.com/JavaClientServer/JavaServeurClient into dev
Correction erreur
Implémentation des données du serveur
Finalisation des données des protocoles.
Reste à faire les protocoles
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
Merge branch 'dev_test_merged' into dev_client
ajout commande add depuis client