Merge origin/Emmanuelle into gael

Conflicts:
	web/WEB-INF/main/Main.jsp
Merge pull request #110 from garzgul/Gael

merge jeudi soir week 2