update from server@local.eng
啟用經銷據點區塊
Merge branch 'local.eng' into local.cht

Conflicts:
	templates/ws-fn-all-tpl.html
	templates/ws-fn-footer-tpl.html
Merge branch 'local.cht' into cht
修改gstone品牌