Merge remote-tracking branch 'origin/master' into 105846070-merge-with-105842700-arireg-for-registrant-port

# Conflicts:
#	app/models/domain.rb

db/migrate/20151202123506_name_and_password_for_reserved_domain.rb

@@ -0,0 +1,18 @@
+class NameAndPasswordForReservedDomain < ActiveRecord::Migration
+  def up
+    add_column :reserved_domains, :name, :string
+    add_column :reserved_domains, :password, :string
+    add_index  :reserved_domains, :name
+
+    ReservedDomain.find_each do |domain|
+      names = domain.names
+      domain.update_columns(name: names.keys.first, password: names.values.first)
+    end
+
+    remove_column :reserved_domains, :names
+  end
+
+  def down
+
+  end
+end

db/migrate/20160108135436_name_and_password_for_blocked_domain.rb

@@ -0,0 +1,11 @@
+class NameAndPasswordForBlockedDomain < ActiveRecord::Migration
+  def up
+    add_column :blocked_domains, :name, :string
+    add_index  :blocked_domains, :name
+    remove_column :blocked_domains, :names
+  end
+
+  def down
+
+  end
+end

db/migrate/20160113143447_create_directos.rb

@@ -0,0 +1,10 @@
+class CreateDirectos < ActiveRecord::Migration
+  def change
+    create_table :directos do |t|
+      t.belongs_to :item, index: true, polymorphic: true
+      t.json :response
+
+      t.timestamps null: false
+    end
+  end
+end

db/migrate/20160118092454_add_in_directo_to_invoice.rb

@@ -0,0 +1,5 @@
+class AddInDirectoToInvoice < ActiveRecord::Migration
+  def change
+    add_column :invoices, :in_directo, :boolean, default: false
+  end
+end