Merge origin/master

Conflicts:
	appli/common/functions.php
	appli/fr/liste_courses.php
Merge origin/master