First commit of calendar project
Merge remote-tracking branch 'origin/master'