some change for help conflicts
Merge branch 'master' of github.com:ging/social_stream