Allow overriding time field on each page edit.
Small clean up
Merge branch 'Denney-override-time' into develop