Fix clockview granularity
Shift hours by 2 quarters: #13 again
Merge branch 'shift' into development