File contents was switched

- The class GeoPointMappingDescriptor was in GeoShapeMappingDescriptor
- The class GeoShapeMappingDescriptor was in GeoPointMappingDescriptor
Merge pull request #774 from andersosthus/mappingfix

File contents was switched for GeoPoint and GeoShape mapping descriptors