added content from other side
Merge branch 'redesign' of https://github.com/sotch-pr35mac/streamr into redesign