migration for location combo code
updates for student residence
fixes and updates from prod