Merge pull request #26 from ua-eas/fix_calendar

Fix calendar
Merge pull request #25 from ua-eas/fix_driver_spec

Fix driver spec
KATTS-2035 merging staging into master for eventual PRD migration
Merge branch 'master' into development