Merge pull request #169 from zendesk/elaine/VOICE-1310_extract_addresses_controller

[VOICE-1310] rename address resource