update from server@local.cht
google translate for jap
設定英翻日的語言列
Merge branch 'local.cht' into local.eng

Conflicts:
	templates/ws-fn-top-menu-tpl.html
產品頁左選單下方顯示聯絡我們圖示
Merge branch 'local.cht' into local.eng
後台列印樣式
後台prints.css
update from server@local.eng
Merge branch 'local.cht' into local.eng
contactus後台列表使用同一個有delete的樣版
Merge branch 'local.cht' into local.eng
Merge branch 'local.eng' into local.jap