Fixed rendering on recurring events. Added tooltips to show how many conflicts.
Merging changes.