Merge pull request #214 from artursmet/feature/dashboard

[WIP] Feature/dashboard
Merge branch 'master' into feature/dashboard