Merge branch 'master' into refactor-messages

# Conflicts:
#	db/structure.sql

test/fixtures/contacts.yml

@@ -14,7 +14,7 @@ william: &william
   name: William
   email: william@inbox.test
   phone: '+555.555'
-  fax: +555.555
+  fax: '+666.6'
   ident: 1234
   ident_type: priv
   ident_country_code: US

test/fixtures/registrars.yml

@@ -40,13 +40,4 @@ complete:
   accounting_customer_code: US0001
   language: en
   vat_no: US12345
-  vat_rate: 0.05
-
-not_in_use:
-  name: any
-  reg_no: any
-  code: any
-  email: any@example.com
-  country_code: US
-  accounting_customer_code: any
-  language: en
+  vat_rate: 0.05

test/fixtures/users.yml

@@ -1,6 +1,6 @@
 api_bestnames:
   username: test_bestnames
-  password: testtest
+  plain_text_password: testtest
   type: ApiUser
   registrar: bestnames
   active: true
@@ -9,7 +9,7 @@ api_bestnames:
 
 api_goodnames:
   username: test_goodnames
-  password: testtest
+  plain_text_password: testtest
   type: ApiUser
   registrar: goodnames
   active: true
@@ -18,6 +18,7 @@ api_goodnames:
 
 admin:
   username: test
+  encrypted_password: <%= Devise::Encryptor.digest(AdminUser, 'testtest') %>
   type: AdminUser
   country_code: US
   roles: