Fixed linechart bug
Merge remote-tracking branch 'origin/master' into player
Fixed player
Fixed merge
Merge remote-tracking branch 'origin/gh-pages'