some new changes

some new changes
Merge branch 'master' of https://github.com/JingLiNaomi/SocialHub