Modification recherche, affichage 'décent' + modif bp-custom
Merge branch 'master' of https://github.com/Fripes/wordpress

Conflicts:
	wp-content/plugins/wpmarketplace/tpls/edit-profile.php