updated project settings

As a result Xcode has changed the format of the project file. That
causes merging hell. Sorry.