Nicks rot klusje gefixed
Merge branch 'feature-redesign' of github.com:CTcue/app into feature-redesign