Merge branch 'master' into add-contacts-email-constraint

# Conflicts:
#	db/structure.sql

db/migrate/20180422154642_rename_domains_statuses_backup_to_statuses_before_force_delete.rb

@@ -0,0 +1,5 @@
+class RenameDomainsStatusesBackupToStatusesBeforeForceDelete < ActiveRecord::Migration
+  def change
+    rename_column :domains, :statuses_backup, :statuses_before_force_delete
+  end
+end

db/migrate/20180713154915_rename_users_password_to_plain_text_password.rb

@@ -0,0 +1,5 @@
+class RenameUsersPasswordToPlainTextPassword < ActiveRecord::Migration
+  def change
+    rename_column :users, :password, :plain_text_password
+  end
+end