Fixing colors on Macs
Fixed #35 (event collisions at same time
Fixed #60 (Am/pm wrong on noon)
Merge remote-tracking branch 'origin/dev' into ui_polish