更新自伺服器111913@cht.local
Merge branch 'cht.local' into chs.local

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