Update Xcode project
Merge remote-tracking branch 'upstream/master' into Xcode
Merge remote-tracking branch 'upstream/master' into Xcode
update changelog
Merge remote-tracking branch 'upstream/master' into Xcode
TerrainHeightEllipsoid added to Xcode project
Merge pull request #2235 from Philbywhizz/Xcode

OSX: Xcode project update
Update Spanish.txt
add Oleg Ovcharenko (UncleVasya) to the AUTHORS list
Merge remote-tracking branch 'gudadantza/patch-35'