Merge contract address and location

Currently, there is a field for a contact’s address and another field for their location. These should be merged so that additional information isn’t required to see people in one location.