Merge branch 'story/105855968-directo' into staging

# Conflicts:
#	Gemfile
#	Gemfile.lock

db/migrate/20160304125933_add_invoice_number_to_directo.rb

@@ -0,0 +1,6 @@
+class AddInvoiceNumberToDirecto < ActiveRecord::Migration
+  def change
+    add_column :directos, :invoice_number, :string
+    execute "UPDATE directos d SET invoice_number=i.number FROM invoices i WHERE d.item_type='Invoice' AND d.item_id=i.id"
+  end
+end

db/migrate/20160311085956_add_exclude_monthly_directo_to_registrar.rb

@@ -0,0 +1,5 @@
+class AddExcludeMonthlyDirectoToRegistrar < ActiveRecord::Migration
+  def change
+    add_column :registrars, :exclude_in_monthly_directo, :boolean, default: false
+  end
+end