Merge origin/master

Conflicts:
	wp-content/themes/dokan_wp_1.0.4/dokan-1.0.4/store-profile.php
sjednoceni gitu
ajax strankovani pomoci alesova nejlepsiho hacku
ajax strankovani pomoci alesova nejlepsiho hacku
Merge origin/master