Incidents map
Use marker count for default lat/long
allowed new report counter to keep going past 25
Merge branch 'develop' of github.com:TID-Lab/aggie into develop
Merge branch '1236_incident_map' into develop

Conflicts:
	public/angular/templates/incidents/map.html