Merge origin/master into gael

Conflicts:
	web/WEB-INF/main/Main.jsp
Merge origin/master into gael

Conflicts:
	src/java/servlet/Controleur.java
	web/WEB-INF/main/Main.jsp
Merge pull request #80 from garzgul/gael

Gael