some changed
Merge branch 'master' of github.com:onepercentclub/stream-ui