Merge origin/serveur into serveur

Conflicts:
	src/main/java/fr/univ/lehavre/caw/Servlet/Converter.java