Support adding event to calendar
Merge branch 'develop'