fixed the vexing rollover issue
fixed merge conflict that we expected
for now, multiple lines on a chart has area off by default
Merge branch 'master' into gh-pages