Merge origin/master

Conflicts:
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/woocommerce/single-product/add-to-cart/simple.php