Merge pull request #87 from devdame/Daniel_d3_fixes

Daniel d3 fixes
Change pie chart into donut chart
Merge branch 'master' into Daniel_d3_fixes