heatmap test
Merge branch 'heatmap'

Conflicts:
	app/src/main/java/com/example/jingyuliu/glocate/MapsActivity.java