added files to populate city and state
Fixed conflict
working on state_id and user_id
fix merge conflict
updated nav controller
fixed merge conflict