sjednoceni gitu
sjednoceni gitu
sjednoceni gitu
Merge origin/master

Conflicts:
	bbop.sql
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/archive-product.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/sidebar-home.php
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/single-product.php