Calendar

Merge all calendar content into master branch