adding heatmap toggle funcitonality
Merge branch 'master' of github.com:madgeeklabs/MyTribe

Conflicts:
	app/views/main.html