bugfixes for 3.6
Merge branch '1.1-pvac' of github.com:essl-pvac/uol-wordpress-theme into 1.1-pvac

Conflicts:
	lib/uol-shortcodes.php