Merge origin/master

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