Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
the graph is drawn client side with flot
scripts now relative to media/, added js/ to includes
added graph tooltip
fixed tooltip
plotgraph cleanup
removed console log
plot background color set
flot plot fixes
more cleanup
tooltip finally working
 added zoom
convert utc timestamps to local time for flot plot
24h consumption barchart drawn by flot
renamed a->total
1y consumption with flot
forgot makefile again
center bars