Merge origin/master

Conflicts:
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/functions-ajax.php
Merge origin/master

Conflicts:
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/functions-ajax.php
Merge origin/master

Conflicts:
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/functions-ajax.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/functions-ales.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/widgets/class-wc-widget-price-filter.php