Merge branch 'registry-765' into registry-623

# Conflicts:
#	app/models/registrar.rb
#	config/locales/en.yml
#	spec/models/registrar_spec.rb
#	test/models/registrar_test.rb

test/fixtures/accounts.yml

@@ -3,3 +3,9 @@ cash:
   balance: 100
   currency: EUR
   registrar: bestnames
+
+not_in_use_cash:
+  account_type: cash
+  balance: 0
+  currency: EUR
+  registrar: not_in_use

test/fixtures/registrars.yml

@@ -3,6 +3,10 @@ bestnames:
   reg_no: 1234
   code: bestnames
   email: info@bestnames.test
+  street: Main Street
+  zip: 12345
+  city: New York
+  state: New York
   country_code: US
   accounting_customer_code: bestnames
   language: en
@@ -16,3 +20,12 @@ goodnames:
   country_code: US
   accounting_customer_code: goodnames
   language: en
+
+not_in_use:
+  name: any
+  reg_no: any
+  code: any
+  email: any@example.com
+  country_code: US
+  accounting_customer_code: any
+  language: en