update from server@eng.local
update from server@spa.local
Merge branch 'spa.local' into spa
嵌入addthis button
Merge branch 'eng.local' into spa.local

Conflicts:
	templates/ws-index-tpl.html
Merge branch 'spa.local' into spa