Merge commit 'origin/master' into hruid

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --cc modules/admin.php
Simple merge

diff --cc modules/carnet.php
Simple merge

diff --cc modules/lists.php
Simple merge

diff --cc modules/marketing.php
Simple merge

diff --cc modules/platal.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge