Last version de moi
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	Accueil.php
	evenements.php
	import2.php
	importation.php
	include/fonctions.php
	recherche.php