Add C3 charts
Merge branch 'master' into features/c3-charts