解决他人主页问题按钮不显示问题

1.他人主页关注按钮不现实问题
Merge remote-tracking branch 'origin/master'

Conflicts:
	JianGuo_Git/gen/com/nut/activity/R.java