plein de truc
Merge branch 'master' of https://github.com/ouvreboite/ecrouvis

Conflicts:
	form_artisan.php
	search_functions.php