Merge pull request #5 from benabbon/splitEmergency_merge

Refactor emergency, merge emergency contacts