hnjkhl
Merge origin/master

Conflicts:
	wp-content/plugins/plugin-name/public/partials/plugin-name-public-display.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/store-reviews.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/woocommerce/single-product/product-image.php
Merge origin/master

Conflicts:
	wp-content/plugins/plugin-name/public/partials/plugin-name-public-display.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/store-reviews.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/woocommerce/single-product/product-image.php