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

Conflicts:
	images/aside_ad1.jpg
	templates/ws-quick-shopping-tpl.html
觸發表單外的第一次購物按鈕
Merge branch 'local.cht' into master.cht
Merge branch 'master.cht' into chs
第一次購物頁轉簡體