Michael: fixed clustering on main map
Merge branch 'develop' of github.com:macewanCMPT395/Team2 into develop

Conflicts:
	application/i18n/en_US/report.php