Merge pull request #75 from garzgul/Mourad

merge fin de 1ere semaine
Merge pull request #76 from garzgul/Eddy

merge fin de 1ere semaine
Merge origin/master into gael

Conflicts:
	web/WEB-INF/main/Main.jsp