functional with defined resources for dashboards, graphs
Merge branch 'hotfix/0.2.0'