Add first revision of calendar to coming episodes
Merge pull request #804 from adam111316/calendar

Add first revision of calendar to coming episodes
Fix some of the unit tests
Merge pull request #805 from adam111316/unittest_fixes

Fix some of the unit tests
Merge remote-tracking branch 'upstream/dev' into dev