.
.
Merge origin/master

Conflicts:
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/store-store.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/templates/market-selling_for_sale.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/templates/sellers.php
.
image order in product form