Merge origin/Mourad into gael

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

merge mercredi soir week 2