Merge PR #417 - improve 24h only mode

Enhances 24 hour only mode by setting defaults properly
and skipping past the 12/24 hour settings page in the
preferences watch face.

Reviewed-by: Matheus Afonso Martins Moreira <matheus@matheusmoreira.com>
GitHub-Pull-Request: https://github.com/joeycastillo/Sensor-Watch/pull/417

diff --cc movement/movement.c
Simple merge

diff --cc movement/watch_faces/clock/clock_face.c
Simple merge