made changes to help integrate the calendar
Merge branch 'master' of https://github.com/rolsen/tinysubscriptions