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

Conflicts:
	templates/ws-index-tpl.html
修改訂購單連結
update from server@cht.local
Merge branch 'cht.local' into cht
產品內頁加入修變數量提示文字
Merge branch 'cht.local' into cht