Merge branch 'hotfix/heatmap_results_2'
Improved results for geocoder.(3)
Merge branch 'hotfix/heatmap_results_3' into develop