update from server@local.chs
Merge branch 'local.chs' into chs

Conflicts:
	templates/ws-news-tpl.html