highcharts in progress
fix scroll bar player stall, highcharts closer
resolve merge conflict with china.jade
Merge branch 'master' of github.com:NUKnightLab/fao-explorer