update from server@cht.local
aboutus首頁加上廣告
首頁廣告限制在index下才出現
update from server@chs.local
Merge branch 'chs.local' into chs
Merge branch 'cht.local' into chs.local

Conflicts:
	templates/ws-fn-top-menu-tpl.html
	templates/ws-index-tpl.html
首頁logo連結
Merge branch 'cht.local' into chs.local

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