Change to 12 hour clock and add meridian indicator.
Merge branch 'showdate'