chart.js and some other things
Merge branch 'neil'