last version
Merge remote-tracking branch 'origin/master'

Conflicts:
	Site/page_entreprise.php