Merge pull request #71 from garzgul/Mourad

merge de jeudi soir
Merge origin/master into Gael

Conflicts:
	src/java/servlet/Controleur.java