Heatmap changes.
Merge branch 'master' of https://github.com/ZIPASmart/r3000
Heatmap changes.