Merge branch 'hotfix/heatmap_results'
Improved results for geocoder.(2)
Merge branch 'hotfix/heatmap_results_2' into develop