burn
Merge branch 'master' of github.com:ging/social_stream
readjust
Merge branch 'master' of github.com:ging/social_stream
before beta
before beta