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

Conflicts:
	application/i18n/en_US/report.php
pushing changes to master after presentation
Merge branch 'develop' of github.com:macewanCMPT395/Team2 into develop
Merge branch 'develop' of github.com:macewanCMPT395/Team2 into develop

Conflicts:
	application/controllers/json.php
	application/models/incident.php
Bringing develop in line
Git added merge message, removed
Michael: OMG, Everything is up to date as of today
Michael: now working on local branch
add error message to map click outside of georole
When a user clicks on an incident outside of their georole the index page is redisplayed and an error at the top of the page is displayed.
verify,approv,delete buttons visible in admin reports page based on georole function
admin can only verify/approve/delete reports in their georole