12 hour clock
Merge branch 'base_app' into beta_1