Pulled in changes from Development branch
Upsert method added for PhoneType

Tests pass
Upsesrt method added for PhoneNumber

Tests pass
Refactored PhoneNumberAccess

Reflects the addition of upsert for phonetype, which now gets called
before adding or updating a phone number