added calender integration
Merge branch 'calender'