sync commit
Merge branch 'master' of https://github.com/ultimaterobotics/vuzlik

Conflicts:
	wp-content/themes/vuzlikus/includes/cert_functions.php