icon for barchart view
cleanup
added support for multi-time series
Merge remote-tracking branch 'upstream/master'