Calendar to dev

Ethan Heinleinrequested to merge
calendar into dev

Move the calendar feature to the dev branch

Merge request reports