X Axis now displays times
Merge branch 'historygraphfix' into develop

Changed XAxis on history graph to display times