Calendar moved to template
Yield variables to the block properly
Changed calendar template to month template
Merge branch 'move-calendar-to-template'