updated chart.js
Merge branch 'test' into dev