Correction recherche copy & paste
Merge branch 'master' of https://github.com/Fripes/wordpress

Conflicts:
	wp-content/plugins/wpmarketplace/libs/scode_add-product.php