Use new core data methods
Merge branch 'master' into CoreDataV2
修复一个UI错误
Merge branch 'CoreDataV2'