Updated Site To use Marker Cluterers
Merge branch 'master' of https://github.com/nokeeo/2014RocCivicAppChallange

Conflicts:
	apiHandler.js
	heatmap.js