Merge branch 'platal-0.9.17'

Conflicts:

	classes/plset.php
	include/user.func.inc.php

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

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

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

diff --cc modules/admin.php
Simple merge

diff --cc modules/axletter.php
Simple merge

diff --cc modules/carnet.php
Simple merge

diff --cc modules/email.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/register/register.inc.php
Simple merge

diff --cc modules/search.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge