divers changement
Merge branch 'master' of https://github.com/melecoq/client--gbiffrance-portal

Conflicts:
	app/portal/search/search.inc.html
changement search.inc.html