Merge branch 'master' of github.com:phpbbireland/k2_phoenix

Conflicts:
	root/images/welcome.png
	root/portal_install/docs/vinfo.txt
	root/portal_install/index.php