twitter bugfix
Merge branch '1.2' of https://github.com/essl-pvac/uol-wordpress-theme into 1.2

Conflicts:
	lib/uol-shortcodes.php