update main
Merge branch 'master' of https://github.com/skji/news

Conflicts:
	protected/config/main.php