Just fixing version number 3.0.12
Fix to hide users that should be hidden
Fixed to blocks/block*.*

Removal of blocks not used...
Adding missing file
Tidy up xml file
Removing unused files...
Updating to 3.0.12
Updating to 1.0.22
Some more 1.0.22 updates
Merge branch 'master' of github.com:phpbbireland/k2_phoenix

Conflicts:
	install.xml
	root/adm/style/acp_k_vars.html
	root/blocks/block_announcements.php
	root/blocks/block_random_image.php
	root/blocks/block_recent_topics.php
	root/blocks/block_recent_topics_wide.php
	root/blocks/block_the_teams.php
	root/blocks/block_youtube.php
	root/portal.php
	root/portal_install/index.php
	root/styles/_portal_common/template/blocks/block_menus_nav.html
	root/styles/_portal_common/template/blocks/block_youtube.html
	root/styles/_portal_common/template/portal_scripts.html
	root/styles/_portal_common/template/wrapper.html
	root/styles/_portal_common/theme/portal_common.css