Merge origin/serveur into client

Conflicts:
	README.md
	src/main/webapp/WEB-INF/Converter.jsp
Merge origin/master