version bump for new publish to the pebble app store
version bump for new publish to the pebble app store
fixed display of 12pm
version bump
merged master into the slot-2 branch, to keep it current