Adds map heatmap
Merge remote-tracking branch 'origin'

Conflicts:
	app/portal/result/result.occurrence.html
	app/scripts/app.js