?
?
?
Merge branch 'UI-upgrade' into Develop
Fixed issue of both clocks counting down after reset