second commit
Merge branch 'master' of https://github.com/socialsensor/socialsensor-stream-manager