Base code for calendar module.
Updated calendar.
Merge branch 'calendar'