Fix overlaping events
Merge branch 'master' of https://github.com/mzdravkov/ao-callendar