garzgul/carpediem — pull request #107 by garzgul (2014-09-18 08:41:07+00:00)
Title: Merge origin/Gael into Gael

Conflicts:
src/java/servlet/Controleur.java