garzgul/carpediem — pull request #79 by garzgul (2014-09-14 20:40:32+00:00)
Title: Merge origin/Emmanuelle into Emmanuelle

Conflicts:
src/java/servlet/Controleur.java