Calendar: added calendar template
Calendar: updated calendar init
Merge remote-tracking branch 'origin/master'