.
Merge origin/master
facebook login stahnuti avataru
.
Merge origin/master

Conflicts:
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/sidebar-home.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/widgets/class-wc-widget-price-filter.php