update before merge(TODO)
Merge branch 'master' of https://github.com/zerocpp/SZPCoreDataManager