Merge commit 'origin/fusionax' into account

Conflicts:

	core

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

diff --cc classes/xorgsession.php
Simple merge

diff --cc modules/admin.php
Simple merge

diff --cc modules/register.php
Simple merge