cron new template
Merge branch 'master_popup'

Conflicts:
	protected/commands/CronCommand.php