Merge remote-tracking branch 'origin/master' into layout
Changed font-size for x- and y-axis labels and some other graph styling
Changed styling of table
gave table rows id's
Layout meter specific info
Layout meter specific info