want to merge!
Merge branch 'master' of https://github.com/ultimaterobotics/vuzlik

Conflicts:
	wp-content/themes/vuzlikus/includes/js/ajax-cert-comparison.js
just want to merge!
just want to merge!