resolution commit 2
Merge branch 'master' of https://github.com/studel/GEMAG
resolve commit (project.pbxproj