correction
Merge remote-tracking branch 'origin/master'

Conflicts:
	Site/page_client.php
	Site/page_entreprise.php
	Site/page_livreur.php