Add events calendar
resolve merge conflicts
Merge pull request #49 from Cynaria/calendar

Calendar