Catégories (en cours)
Merge branch 'master' of https://github.com/Fripes/wordpress

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