Fix for contacts
Merge branch 'version2' of https://github.com/MinorTechnologiesLLC/emergencysafeguard into version2
Merge branch 'version2' of https://github.com/MinorTechnologiesLLC/emergencysafeguard into version2
Merge branch 'version2' of https://github.com/MinorTechnologiesLLC/emergencysafeguard into version2
Fixing resources mess from Brandon