update from server@cht.local
a name改成a id
Merge branch 'cht.local' into eng.local

Conflicts:
	images/slogan.png
	templates/ws-index-tpl.html
Merge branch 'eng.local' into eng