Merge branch 'master' into registry-791

# Conflicts:
#	db/structure.sql

app/models/concerns/contact/transferable.rb

@@ -16,6 +16,7 @@ module Concerns::Contact::Transferable
     new_contact.regenerate_code
     new_contact.regenerate_auth_info
     new_contact.remove_address unless self.class.address_processing?
+    new_contact.uuid = nil
     new_contact.save(validate: false)
     new_contact
   end

app/models/sorted_country.rb

@@ -18,7 +18,7 @@ class SortedCountry
     def quick_list
       @quick_list ||=
         [
-          %w[Estonia' EE],
+          %w[Estonia EE],
           %w[Finland FI],
           %w[Latvia LV],
           %w[Lithuania LT],