Merge branch 'master', remote branch 'upstream/master'
flot bar chart
Merge pull request #26 from dklawren/branch

fixed