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

Conflicts:
	templates/ws-fn-top-menu-tpl.html
update from server@chs.local
Merge branch 'chs.local' into chs
修改頁腳的郵遞區號
Merge branch 'cht.local' into chs.local

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