residual vish work
Merge branch 'master' of github.com:ging/social_stream
Merge branch 'master' of github.com:ging/social_stream
Merge branch 'master' of github.com:ging/social_stream
adjust
fix merge