Redo elastic search indexing and searching
Fix elasticsearch mapping for term queries and company geo point
Merge branch 'feature/elasticsearch' into develop
Merge branch 'release/RELEASE_0.4.2'