removed commented out lines
Merge branch 'update_jquery_highchart'
Merge branch 'master' into kairosdb