Merge origin/master

Conflicts:
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/assets/css/bootstrap.css
male vylepseni stranky pridavani produktu - vyber meny je nyni u ceny
little improve for the user administration
sjednoceni gitu
Merge origin/master

Conflicts:
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/assets/css/bootstrap.css