garzgul/carpediem — pull request #81 by garzgul (2014-09-15 09:10:33+00:00)
Title: Merge origin/Gael into Gael

Conflicts:
src/java/bean/acheteur/Acheteur.java