修复一些显示文字不正确
Merge branch 'master' of https://github.com/wangyh-thss/MeeBo

Conflicts:
	user/MyFans.aspx