Switching to JURI::root()
Merge remote-tracking branch 'origin/master'

Conflicts:
	k2cron.php
Switching to JURI::root()