gestion dossier au 2/3
Merge branch 'master' of https://github.com/Isabelle-Angrignon/SERVEURECHO

Conflicts:
	ServeurWeb/src/serveurweb/Configuration.java