core data updates
calendar updates
Merge branch 'develop' of github.com:kvendrik/sense-of-urgency into develop