Migrate calendar app to use marionette By
Merge pull request #1202 from teodosia/by-migrate-calendar

Migrate calendar app to use marionette By