Merge branch 'serveur' of https://github.com/Jeremy27/ProjetCAW into serveur

Conflicts:
	src/main/webapp/WEB-INF/Converter.jsp
Merge branch 'serveur'
Merge branch 'master' of https://github.com/Jeremy27/ProjetCAW