Fixed possible bug in SocialHeatMapFragment
Merge branch 'dev' into mntnorv-dev