heat map integration
Merge branch 'master' of https://github.com/theodori/AndroidExperimentation