Merge origin/master

Conflicts:
	appli/common/functions.php
Merge origin/master
modif edit et ajout course