Improve save heatmap and new layer load performance
Merge branch 'develop' of github.com:gitools/gitools into develop