update from server@cht.local
aboutus顯示產品左選單
所有頁面都顯示slogan
update from server@chs.local
Merge branch 'chs.local' into chs
Merge branch 'cht.local' into chs.local

Conflicts:
	css/cms-index.css
	images/slogan-bg.png
	templates/ws-contactus-form-tpl.html
	templates/ws-products-detail1-tpl.html
Merge branch 'chs.local' into chs