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
Fixed #775 deserialization of GeoBoundingFilter not using invariantculture, we now also force invariant culture on all strings formatted with the .F() extension method.
Merge branch 'develop' of github.com:elasticsearch/elasticsearch-net into develop