Merge branch 'master' into products-caching

Conflicts:
	spec/features/admin/variant_overrides_spec.rb

db/migrate/20160205044930_add_email_address_to_enterprises.rb

@@ -0,0 +1,5 @@
+class AddEmailAddressToEnterprises < ActiveRecord::Migration
+  def change
+    add_column :enterprises, :email_address, :string
+  end
+end

db/migrate/20160212092908_set_enterprise_email_address.rb

@@ -0,0 +1,8 @@
+class SetEnterpriseEmailAddress < ActiveRecord::Migration
+  def up
+    Enterprise.all.each do |enterprise|
+      enterprise.email_address = enterprise.email
+      enterprise.save
+    end
+  end
+end

db/schema.rb

@@ -347,6 +347,7 @@ ActiveRecord::Schema.define(:version => 20160302044850) do
     t.boolean  "producer_profile_only",    :default => false
     t.string   "permalink",                                    :null => false
     t.boolean  "charges_sales_tax",        :default => false,  :null => false
+    t.string   "email_address"
   end
 
   add_index "enterprises", ["address_id"], :name => "index_enterprises_on_address_id"