update from server@master.eng
啟用詢價管理
Merge branch 'master.eng' into cht

Conflicts:
	templates/ws-index-tpl.html
update from server@jap
Merge branch 'cht' into jap