add country to contact
test for adding country to contact
set_account order changed in application_controller
Merge conflicts