more safety in saveAndMergeWithMainContext
Merge branch 'master' of https://github.com/vokalinteractive/VOKCoreDataManager