switched to highcharts
Merge branch 'highcharts'

* highcharts:
  switched to highcharts