Updates for offender infowindow
Merge branch 'version2' of github.com:MinorTechnologiesLLC/emergencysafeguard into version2