Merge origin/master

Conflicts:
	web/rechercheClient.jsp
Merge origin/master