Fix issue where calendar refreshes on viewDidAppear and blocks main thread. Move method to viewDidLoad and add notification to listen for core data saves and refresh data when objects are added to context.
Resolve merge conflict in app delegate