Merge branch 'master' into contactListVC
fix coreData error
Merge branch 'contactListVC'