Change graph times to 24h format
Merge branch 'UI-X' into master-test