more modifications according to design.
Merge remote-tracking branch 'origin/master'

Conflicts:
	xichao_wechat_web/temp/serve.html
more modifications