garzgul/carpediem — pull request #110 by garzgul (2014-09-18 16:43:15+00:00)
Title: merge jeudi soir week 2

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