Joomla
Merge github.com:RobHooper/ghost-avenger

Conflicts:
	joomla/configuration.php