fix xcode update
gitignore file
core data
Merge branch 'dev'