more adjust
Merge branch 'master' of https://github.com/ging/social_stream
optimize for finish #2
optimize for finish #3
big-change