Merge branch 'dev-redesign' into dev
Merge pull request #40 from n8ebel/dev

Merge branch 'dev-redesign' into dev