Event mail sending
Calendar fixes
Merge commit