Merge branch 'master' into registry-475

# Conflicts:
#	config/locales/et.yml
#	db/structure.sql

db/migrate/20170509215614_remove_addresses_with_versions.rb

@@ -0,0 +1,6 @@
+class RemoveAddressesWithVersions < ActiveRecord::Migration
+  def change
+    drop_table :addresses
+    drop_table :log_addresses
+  end
+end

db/migrate/20170606133501_add_foreign_key_constraints_to_domains.rb

@@ -0,0 +1,6 @@
+class AddForeignKeyConstraintsToDomains < ActiveRecord::Migration
+  def change
+    add_foreign_key :domains, :registrars, name: 'domains_registrar_id_fk'
+    add_foreign_key :domains, :contacts, column: :registrant_id, name: 'domains_registrant_id_fk'
+  end
+end

db/migrate/20170606150352_change_domain_registrar_and_registrant_to_not_null.rb

@@ -0,0 +1,6 @@
+class ChangeDomainRegistrarAndRegistrantToNotNull < ActiveRecord::Migration
+  def change
+    change_column :domains, :registrar_id, :integer, null: false
+    change_column :domains, :registrant_id, :integer, null: false
+  end
+end

db/migrate/20170606202859_improve_contact_registrar_id.rb

@@ -0,0 +1,6 @@
+class ImproveContactRegistrarId < ActiveRecord::Migration
+  def change
+    add_foreign_key :contacts, :registrars, name: 'contacts_registrar_id_fk'
+    change_column :contacts, :registrar_id, :integer, null: false
+  end
+end