Change mapping for residence field: cityid => address
Merge pull request #5 from chrisshayan/R30Sprint1-ChangeFieldMapping

Change mapping for residence field: cityid => address