garzgul/carpediem — pull request #105 by garzgul (2014-09-18 04:36:20+00:00)
Title: merge mercredi soir week 2

Conflicts:
web/WEB-INF/main/Main.jsp