tang

取消关注按钮 美化
Merge branch 'master' of https://github.com/RongShu/xiaoqu

Conflicts:
	xiaoqu/LoginViewController.m