Add the time axis
Merge branch 'time-axis' into develop
Minor style fixes in the time axis
Merge branch 'time-axis' into develop