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

Testing... Made something wrong on last commit.

This reverts commit a60ce7b6a95d030ff53dfcaa4e3bb9f9d2d0c9c7, reversing
changes made to cbe37494b3c94e697d3e837710a6b49137a8532c.

Conflicts:
	root/portal_install/index.php
Looks sucessful revert.