Merge branch 'master' of github.com:domify/registry

Conflicts:
	config/locales/en.yml
	db/schema.rb

db/migrate/20150519094929_add_aciton_to_registrant_verification.rb

@@ -0,0 +1,5 @@
+class AddAcitonToRegistrantVerification < ActiveRecord::Migration
+  def change
+    add_column :registrant_verifications, :action, :string
+  end
+end

db/migrate/20150519095416_add_domain_id_to_registrant_verifications.rb

@@ -0,0 +1,6 @@
+class AddDomainIdToRegistrantVerifications < ActiveRecord::Migration
+  def change
+    add_column :registrant_verifications, :domain_id, :integer
+    add_index :registrant_verifications, :domain_id
+  end
+end

db/migrate/20150519102521_add_action_type_to_registrant_verifications.rb

@@ -0,0 +1,5 @@
+class AddActionTypeToRegistrantVerifications < ActiveRecord::Migration
+  def change
+    add_column :registrant_verifications, :action_type, :string
+  end
+end