Added line charts and a bunch of other things were tweaked.
Merge remote-tracking branch 'origin/master'