Merge origin/master

Conflicts:
	bbop.sql
	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/templates/activity.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/templates/market-selling_order_detail.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/templates/market-selling_orders.php
Merge origin/master