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

Conflicts:
	css/common.css
更新購物車按鈕樣式
Merge branch 'cht.local' into cht