Replace rickshaw.js with highcharts.js
Merge remote-tracking branch 'origin/master'