Coucou !
Coucou !
Merge origin/master into Clement

Conflicts:
	web/index.jsp
Merge pull request #3 from BDrouilly/Clement

Clement