优化
Merge branch 'master' of github.com:Draveness/SportJoin

Conflicts:
	SportJoin.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
优化时间线和关注人的加载