?> en trop
Merge remote-tracking branch 'origin/master'

Conflicts:
	QawiInscription/admin/administration.php