Merge pull request #73 from garzgul/master

Merge pull request #72 from garzgul/Gael
Merge origin/Eddy into Gael

Conflicts:
	src/java/servlet/Controleur.java
Merge pull request #74 from garzgul/Gael

Gael