Merge commit 'origin/fusionax' into account

Conflicts:

	classes/user.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc include/marketing.inc.php
Simple merge

diff --cc include/user.func.inc.php
Simple merge