fix for wrong labels
Merge branch 'master' of https://github.com/sharewave/frontus
fix on dashboard
Merge branch 'master' into testing