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
Remove Integration folder and move query/filter tests to Search
Support for geo_shape attribute based mapping
Add score_mode option to Rescore
Merge pull request #780 from elasticsearch/fix/add-score-mode

Add score_mode option to Rescore
Remove Integration folder and move query/filter tests to Search
Support for geo_shape attribute based mapping
Add score_mode option to Rescore
Merge remote-tracking branch 'upstream/develop' into develop