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

Conflicts:
	templates/ws-fn-top-menu-tpl.html
Merge branch 'local.chs' into chs