diff --git a/Gemfile b/Gemfile
index a55c5cf3e4..aaae276efe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,11 +4,11 @@ ruby "1.9.3"
 gem 'rails', '3.2.11'
 
 gem 'pg'
-gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-2-stable'
+gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-3-stable'
 gem 'spree_i18n', :git => 'git://github.com/spree/spree_i18n.git'
-gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git', :branch => '1-2-stable'
+gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git', :branch => '1-3-stable'
 gem 'spree_last_address', :git => 'git://github.com/dancinglightning/spree-last-address.git'
-gem 'spree_auth_devise', :git => 'https://github.com/spree/spree_auth_devise.git', :branch => '1-2-stable'
+gem 'spree_auth_devise', :git => 'https://github.com/spree/spree_auth_devise.git', :branch => '1-3-stable'
 
 gem 'comfortable_mexican_sofa'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 9eb8840235..ea20e69f92 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,47 +23,47 @@ GIT
 
 GIT
   remote: git://github.com/spree/spree.git
-  revision: 42a98e2299e54b8d5ff73a047926612c816a6934
-  branch: 1-2-stable
+  revision: 36a59eb311470a2c24b9aa826ecad114c518c01f
+  branch: 1-3-stable
   specs:
-    spree (1.2.4)
-      spree_api (= 1.2.4)
-      spree_cmd (= 1.2.4)
-      spree_core (= 1.2.4)
-      spree_dash (= 1.2.4)
-      spree_promo (= 1.2.4)
-      spree_sample (= 1.2.4)
-    spree_api (1.2.4)
-      spree_core (= 1.2.4)
-    spree_cmd (1.2.4)
+    spree (1.3.3.beta)
+      spree_api (= 1.3.3.beta)
+      spree_cmd (= 1.3.3.beta)
+      spree_core (= 1.3.3.beta)
+      spree_dash (= 1.3.3.beta)
+      spree_promo (= 1.3.3.beta)
+      spree_sample (= 1.3.3.beta)
+    spree_api (1.3.3.beta)
+      spree_core (= 1.3.3.beta)
+      versioncake (= 0.4.0)
+    spree_cmd (1.3.3.beta)
       thor (>= 0.14.6)
-    spree_core (1.2.4)
+    spree_core (1.3.3.beta)
       activemerchant (~> 1.29.3)
       acts_as_list (= 0.1.4)
       awesome_nested_set (= 2.1.5)
       aws-sdk (~> 1.3.4)
-      cancan (= 1.6.7)
+      cancan (= 1.6.8)
       deface (>= 0.9.0)
       ffaker (~> 1.12.0)
       highline (= 1.6.11)
-      jquery-rails (~> 2.1.4)
+      jquery-rails (~> 2.2.0)
       kaminari (= 0.13.0)
       money (= 5.0.0)
       paperclip (~> 2.8)
       rabl (= 0.7.2)
       rails (~> 3.2.11)
       ransack (~> 0.7.2)
-      select2-rails (~> 3.0)
       select2-rails (~> 3.2)
       state_machine (= 1.1.2)
       stringex (~> 1.3.2)
-    spree_dash (1.2.4)
+    spree_dash (1.3.3.beta)
       httparty (~> 0.8.1)
-      spree_core (= 1.2.4)
-    spree_promo (1.2.4)
-      spree_core (= 1.2.4)
-    spree_sample (1.2.4)
-      spree_core (= 1.2.4)
+      spree_core (= 1.3.3.beta)
+    spree_promo (1.3.3.beta)
+      spree_core (= 1.3.3.beta)
+    spree_sample (1.3.3.beta)
+      spree_core (= 1.3.3.beta)
 
 GIT
   remote: git://github.com/spree/spree_i18n.git
@@ -75,18 +75,18 @@ GIT
 
 GIT
   remote: git://github.com/spree/spree_paypal_express.git
-  revision: 524009008727ef2a4ad8f00baa2499ee47460a3b
-  branch: 1-2-stable
+  revision: 483f6ababa9c8a1c574aad0a948c96cc21a591db
+  branch: 1-3-stable
   specs:
     spree_paypal_express (1.2.0)
-      spree_core (~> 1.2)
+      spree_core (~> 1.3.0)
 
 GIT
   remote: https://github.com/spree/spree_auth_devise.git
-  revision: 077029cedd48570e4423ba2d99f0fa38300f70ea
-  branch: 1-2-stable
+  revision: ab03a7a22740b52f96bf0311a1e9f18a99ee02f2
+  branch: 1-3-stable
   specs:
-    spree_auth_devise (1.2.0)
+    spree_auth_devise (1.0.0)
       cancan (~> 1.6.7)
       devise (~> 2.2.3)
       devise-encryptable (= 0.1.1)
@@ -152,7 +152,7 @@ GEM
       httparty (>= 0.5, < 1.0)
       multi_json (~> 1.0)
     builder (3.0.4)
-    cancan (1.6.7)
+    cancan (1.6.8)
     capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -218,7 +218,7 @@ GEM
       multi_xml
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.6)
@@ -361,6 +361,10 @@ GEM
       rack
       raindrops (~> 0.7)
     uuidtools (2.1.3)
+    versioncake (0.4.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
     warden (1.2.1)
       rack (>= 1.0)
     websocket (1.0.6)
diff --git a/db/migrate/20130207043541_spree_one_two.spree.rb b/db/migrate/20130207043541_spree_one_two.spree.rb
new file mode 100644
index 0000000000..ad81bfeabe
--- /dev/null
+++ b/db/migrate/20130207043541_spree_one_two.spree.rb
@@ -0,0 +1,482 @@
+# This migration comes from spree (originally 20120831092320)
+class SpreeOneTwo < ActiveRecord::Migration
+  def up
+    # This migration is just a compressed version of all the previous
+    # migrations for spree_core. Do not run it if one of the core tables
+    # already exists. Assume the best.
+    return if table_exists?(:spree_addresses)
+
+
+    create_table :spree_activators do |t|
+      t.string     :description
+      t.datetime   :expires_at
+      t.datetime   :starts_at
+      t.string     :name
+      t.string     :event_name
+      t.string     :type
+      t.integer    :usage_limit
+      t.string     :match_policy, :default => 'all'
+      t.string     :code
+      t.boolean    :advertise,    :default => false
+      t.string     :path
+      t.timestamps
+    end
+
+    create_table :spree_addresses do |t|
+      t.string     :firstname
+      t.string     :lastname
+      t.string     :address1
+      t.string     :address2
+      t.string     :city
+      t.string     :zipcode
+      t.string     :phone
+      t.string     :state_name
+      t.string     :alternative_phone
+      t.string     :company
+      t.references :state
+      t.references :country
+      t.timestamps
+    end
+
+    add_index :spree_addresses, [:firstname], :name => 'index_addresses_on_firstname'
+    add_index :spree_addresses, [:lastname],  :name => 'index_addresses_on_lastname'
+
+    create_table :spree_adjustments do |t|
+      t.references :source,     :polymorphic => true
+      t.references :adjustable, :polymorphic => true
+      t.references :originator, :polymorphic => true
+      t.decimal    :amount,     :precision => 8, :scale => 2
+      t.string     :label
+      t.boolean    :mandatory
+      t.boolean    :locked
+      t.boolean    :eligible,   :default => true
+      t.timestamps
+    end
+
+    add_index :spree_adjustments, [:adjustable_id], :name => 'index_adjustments_on_order_id'
+
+    create_table :spree_assets do |t|
+      t.references :viewable,               :polymorphic => true
+      t.integer    :attachment_width
+      t.integer    :attachment_height
+      t.integer    :attachment_file_size
+      t.integer    :position
+      t.string     :attachment_content_type
+      t.string     :attachment_file_name
+      t.string     :type,                   :limit => 75
+      t.datetime   :attachment_updated_at
+      t.text       :alt
+    end
+
+    add_index :spree_assets, [:viewable_id],          :name => 'index_assets_on_viewable_id'
+    add_index :spree_assets, [:viewable_type, :type], :name => 'index_assets_on_viewable_type_and_type'
+
+    create_table :spree_calculators do |t|
+      t.string     :type
+      t.references :calculable, :polymorphic => true
+      t.timestamps
+    end
+
+    create_table :spree_configurations do |t|
+      t.string     :name
+      t.string     :type, :limit => 50
+      t.timestamps
+    end
+
+    add_index :spree_configurations, [:name, :type], :name => 'index_spree_configurations_on_name_and_type'
+
+    create_table :spree_countries do |t|
+      t.string  :iso_name
+      t.string  :iso
+      t.string  :iso3
+      t.string  :name
+      t.integer :numcode
+    end
+
+    create_table :spree_credit_cards do |t|
+      t.string     :month
+      t.string     :year
+      t.string     :cc_type
+      t.string     :last_digits
+      t.string     :first_name
+      t.string     :last_name
+      t.string     :start_month
+      t.string     :start_year
+      t.string     :issue_number
+      t.references :address
+      t.string     :gateway_customer_profile_id
+      t.string     :gateway_payment_profile_id
+      t.timestamps
+    end
+
+    create_table :spree_gateways do |t|
+      t.string     :type
+      t.string     :name
+      t.text       :description
+      t.boolean    :active,      :default => true
+      t.string     :environment, :default => 'development'
+      t.string     :server,      :default => 'test'
+      t.boolean    :test_mode,   :default => true
+      t.timestamps
+    end
+
+    create_table :spree_inventory_units do |t|
+      t.integer    :lock_version,        :default => 0
+      t.string     :state
+      t.references :variant
+      t.references :order
+      t.references :shipment
+      t.references :return_authorization
+      t.timestamps
+    end
+
+    add_index :spree_inventory_units, [:order_id],    :name => 'index_inventory_units_on_order_id'
+    add_index :spree_inventory_units, [:shipment_id], :name => 'index_inventory_units_on_shipment_id'
+    add_index :spree_inventory_units, [:variant_id],  :name => 'index_inventory_units_on_variant_id'
+
+    create_table :spree_line_items do |t|
+      t.references :variant
+      t.references :order
+      t.integer    :quantity,                               :null => false
+      t.decimal    :price,    :precision => 8, :scale => 2, :null => false
+      t.timestamps
+    end
+
+    add_index :spree_line_items, [:order_id],   :name => 'index_spree_line_items_on_order_id'
+    add_index :spree_line_items, [:variant_id], :name => 'index_spree_line_items_on_variant_id'
+
+    create_table :spree_log_entries do |t|
+      t.references :source, :polymorphic => true
+      t.text     :details
+      t.timestamps
+    end
+
+    create_table :spree_mail_methods do |t|
+      t.string     :environment
+      t.boolean    :active,     :default => true
+      t.timestamps
+    end
+
+    create_table :spree_option_types do |t|
+      t.string    :name,         :limit => 100
+      t.string    :presentation, :limit => 100
+      t.integer   :position,                   :default => 0, :null => false
+      t.timestamps
+    end
+
+    create_table :spree_option_types_prototypes, :id => false do |t|
+      t.references :prototype
+      t.references :option_type
+    end
+
+    create_table :spree_option_values do |t|
+      t.integer    :position
+      t.string     :name
+      t.string     :presentation
+      t.references :option_type
+      t.timestamps
+    end
+
+    create_table :spree_option_values_variants, :id => false do |t|
+      t.references :variant
+      t.references :option_value
+    end
+
+    add_index :spree_option_values_variants, [:variant_id, :option_value_id], :name => 'index_option_values_variants_on_variant_id_and_option_value_id'
+    add_index :spree_option_values_variants, [:variant_id],                   :name => 'index_spree_option_values_variants_on_variant_id'
+
+    create_table :spree_orders do |t|
+      t.string     :number,               :limit => 15
+      t.decimal    :item_total,                         :precision => 8, :scale => 2, :default => 0.0, :null => false
+      t.decimal    :total,                              :precision => 8, :scale => 2, :default => 0.0, :null => false
+      t.string     :state
+      t.decimal    :adjustment_total,                   :precision => 8, :scale => 2, :default => 0.0, :null => false
+      t.references :user
+      t.datetime   :completed_at
+      t.references :bill_address
+      t.references :ship_address
+      t.decimal    :payment_total,                      :precision => 8, :scale => 2, :default => 0.0
+      t.references :shipping_method
+      t.string     :shipment_state
+      t.string     :payment_state
+      t.string     :email
+      t.text       :special_instructions
+      t.timestamps
+    end
+
+    add_index :spree_orders, [:number], :name => 'index_spree_orders_on_number'
+
+    create_table :spree_payment_methods do |t|
+      t.string     :type
+      t.string     :name
+      t.text       :description
+      t.boolean    :active,      :default => true
+      t.string     :environment, :default => 'development'
+      t.datetime   :deleted_at
+      t.string     :display_on
+      t.timestamps
+    end
+
+    create_table :spree_payments do |t|
+      t.decimal    :amount, :precision => 8, :scale => 2, :default => 0.0, :null => false
+      t.references :order
+      t.references :source, :polymorphic => true
+      t.references :payment_method
+      t.string     :state
+      t.string     :response_code
+      t.string     :avs_response
+      t.timestamps
+    end
+
+    create_table :spree_preferences do |t|
+      t.string     :name, :limit => 100
+      t.references :owner, :polymorphic => true
+      t.text       :value
+      t.string     :key
+      t.string     :value_type
+      t.timestamps
+    end
+
+    add_index :spree_preferences, [:key], :name => 'index_spree_preferences_on_key', :unique => true
+
+    create_table :spree_product_option_types do |t|
+      t.integer    :position
+      t.references :product
+      t.references :option_type
+      t.timestamps
+    end
+
+    create_table :spree_product_properties do |t|
+      t.string     :value
+      t.references :product
+      t.references :property
+      t.timestamps
+    end
+
+    add_index :spree_product_properties, [:product_id], :name => 'index_product_properties_on_product_id'
+
+    create_table :spree_products do |t|
+      t.string     :name,                 :default => '', :null => false
+      t.text       :description
+      t.datetime   :available_on
+      t.datetime   :deleted_at
+      t.string     :permalink
+      t.string     :meta_description
+      t.string     :meta_keywords
+      t.references :tax_category
+      t.references :shipping_category
+      t.integer    :count_on_hand,        :default => 0,  :null => false
+      t.timestamps
+    end
+
+    add_index :spree_products, [:available_on], :name => 'index_spree_products_on_available_on'
+    add_index :spree_products, [:deleted_at],   :name => 'index_spree_products_on_deleted_at'
+    add_index :spree_products, [:name],         :name => 'index_spree_products_on_name'
+    add_index :spree_products, [:permalink],    :name => 'index_spree_products_on_permalink'
+
+    create_table :spree_products_taxons, :id => false do |t|
+      t.references :product
+      t.references :taxon
+    end
+
+    add_index :spree_products_taxons, [:product_id], :name => 'index_spree_products_taxons_on_product_id'
+    add_index :spree_products_taxons, [:taxon_id],   :name => 'index_spree_products_taxons_on_taxon_id'
+
+    create_table :spree_properties do |t|
+      t.string     :name
+      t.string     :presentation, :null => false
+      t.timestamps
+    end
+
+    create_table :spree_properties_prototypes, :id => false do |t|
+      t.references :prototype
+      t.references :property
+    end
+
+    create_table :spree_prototypes do |t|
+      t.string     :name
+      t.timestamps
+    end
+
+    create_table :spree_return_authorizations do |t|
+      t.string     :number
+      t.string     :state
+      t.decimal    :amount, :precision => 8, :scale => 2, :default => 0.0, :null => false
+      t.references :order
+      t.text       :reason
+      t.timestamps
+    end
+
+    create_table :spree_roles do |t|
+      t.string :name
+    end
+
+    create_table :spree_roles_users, :id => false do |t|
+      t.references :role
+      t.references :user
+    end
+
+    add_index :spree_roles_users, [:role_id], :name => 'index_spree_roles_users_on_role_id'
+    add_index :spree_roles_users, [:user_id], :name => 'index_spree_roles_users_on_user_id'
+
+    create_table :spree_shipments do |t|
+      t.string     :tracking
+      t.string     :number
+      t.decimal    :cost,           :precision => 8, :scale => 2
+      t.datetime   :shipped_at
+      t.references :order
+      t.references :shipping_method
+      t.references :address
+      t.string     :state
+      t.timestamps
+    end
+
+    add_index :spree_shipments, [:number], :name => 'index_shipments_on_number'
+
+    create_table :spree_shipping_categories do |t|
+      t.string   :name
+      t.timestamps
+    end
+
+    create_table :spree_shipping_methods do |t|
+      t.string     :name
+      t.references :zone
+      t.string     :display_on
+      t.references :shipping_category
+      t.boolean    :match_none
+      t.boolean    :match_all
+      t.boolean    :match_one
+      t.datetime   :deleted_at
+      t.timestamps
+    end
+
+    create_table :spree_state_changes do |t|
+      t.string     :name
+      t.string     :previous_state
+      t.references :stateful
+      t.references :user
+      t.string     :stateful_type
+      t.string     :next_state
+      t.timestamps
+    end
+
+    create_table :spree_states do |t|
+      t.string     :name
+      t.string     :abbr
+      t.references :country
+    end
+
+    create_table :spree_tax_categories do |t|
+      t.string     :name
+      t.string     :description
+      t.boolean    :is_default, :default => false
+      t.datetime   :deleted_at
+      t.timestamps
+    end
+
+    create_table :spree_tax_rates do |t|
+      t.decimal    :amount,            :precision => 8, :scale => 5
+      t.references :zone
+      t.references :tax_category
+      t.boolean    :included_in_price, :default => false
+      t.timestamps
+    end
+
+    create_table :spree_taxonomies do |t|
+      t.string     :name, :null => false
+      t.timestamps
+    end
+
+    create_table :spree_taxons do |t|
+      t.references :parent
+      t.integer    :position,          :default => 0
+      t.string     :name,                             :null => false
+      t.string     :permalink
+      t.references :taxonomy
+      t.integer    :lft
+      t.integer    :rgt
+      t.string     :icon_file_name
+      t.string     :icon_content_type
+      t.integer    :icon_file_size
+      t.datetime   :icon_updated_at
+      t.text       :description
+      t.timestamps
+    end
+
+    add_index :spree_taxons, [:parent_id],   :name => 'index_taxons_on_parent_id'
+    add_index :spree_taxons, [:permalink],   :name => 'index_taxons_on_permalink'
+    add_index :spree_taxons, [:taxonomy_id], :name => 'index_taxons_on_taxonomy_id'
+
+    create_table :spree_tokenized_permissions, :force => true do |t|
+      t.references :permissable, :polymorphic => true
+      t.string     :token
+      t.timestamps
+    end
+
+    add_index :spree_tokenized_permissions, [:permissable_id, :permissable_type], :name => 'index_tokenized_name_and_type'
+
+    create_table :spree_trackers do |t|
+      t.string     :environment
+      t.string     :analytics_id
+      t.boolean    :active,       :default => true
+      t.timestamps
+    end
+
+    create_table :spree_users do |t|
+      t.string     :encrypted_password,     :limit => 128
+      t.string     :password_salt,          :limit => 128
+      t.string     :email
+      t.string     :remember_token
+      t.string     :persistence_token
+      t.string     :reset_password_token
+      t.string     :perishable_token
+      t.integer    :sign_in_count,                         :default => 0, :null => false
+      t.integer    :failed_attempts,                       :default => 0, :null => false
+      t.datetime   :last_request_at
+      t.datetime   :current_sign_in_at
+      t.datetime   :last_sign_in_at
+      t.string     :current_sign_in_ip
+      t.string     :last_sign_in_ip
+      t.string     :login
+      t.references :ship_address
+      t.references :bill_address
+      t.string     :authentication_token
+      t.string     :unlock_token
+      t.datetime   :locked_at
+      t.datetime   :remember_created_at
+      t.datetime   :reset_password_sent_at
+      t.timestamps
+    end
+
+    create_table :spree_variants do |t|
+      t.string     :sku,                                         :default => '',    :null => false
+      t.decimal    :price,         :precision => 8, :scale => 2,                    :null => false
+      t.decimal    :weight,        :precision => 8, :scale => 2
+      t.decimal    :height,        :precision => 8, :scale => 2
+      t.decimal    :width,         :precision => 8, :scale => 2
+      t.decimal    :depth,         :precision => 8, :scale => 2
+      t.datetime   :deleted_at
+      t.boolean    :is_master,                                   :default => false
+      t.references :product
+      t.integer    :count_on_hand,                               :default => 0,     :null => false
+      t.decimal    :cost_price,    :precision => 8, :scale => 2
+      t.integer    :position
+    end
+
+    add_index :spree_variants, [:product_id], :name => 'index_spree_variants_on_product_id'
+
+    create_table :spree_zone_members do |t|
+      t.references :zoneable, :polymorphic => true
+      t.references :zone
+      t.timestamps
+    end
+
+    create_table :spree_zones do |t|
+      t.string     :name
+      t.string     :description
+      t.boolean    :default_tax,        :default => false
+      t.integer    :zone_members_count, :default => 0
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20130207043542_remove_unused_preference_columns.spree.rb b/db/migrate/20130207043542_remove_unused_preference_columns.spree.rb
new file mode 100644
index 0000000000..6c049daa22
--- /dev/null
+++ b/db/migrate/20130207043542_remove_unused_preference_columns.spree.rb
@@ -0,0 +1,9 @@
+# This migration comes from spree (originally 20120929093553)
+class RemoveUnusedPreferenceColumns < ActiveRecord::Migration
+  def change
+    # Columns have already been removed if the application was upgraded from an older version, but must be removed from new apps.
+    remove_column :spree_preferences, :name       if ActiveRecord::Base.connection.column_exists?(:spree_preferences, :name)
+    remove_column :spree_preferences, :owner_id   if ActiveRecord::Base.connection.column_exists?(:spree_preferences, :owner_id)
+    remove_column :spree_preferences, :owner_type if ActiveRecord::Base.connection.column_exists?(:spree_preferences, :owner_type)
+  end
+end
diff --git a/db/migrate/20130207043543_add_states_required_to_countries.spree.rb b/db/migrate/20130207043543_add_states_required_to_countries.spree.rb
new file mode 100644
index 0000000000..415001d170
--- /dev/null
+++ b/db/migrate/20130207043543_add_states_required_to_countries.spree.rb
@@ -0,0 +1,6 @@
+# This migration comes from spree (originally 20121010142909)
+class AddStatesRequiredToCountries < ActiveRecord::Migration
+  def change
+    add_column :spree_countries, :states_required, :boolean,:default => true
+  end
+end
diff --git a/db/migrate/20130207043544_add_on_demand_to_product_and_variant.spree.rb b/db/migrate/20130207043544_add_on_demand_to_product_and_variant.spree.rb
new file mode 100644
index 0000000000..ba258ebf26
--- /dev/null
+++ b/db/migrate/20130207043544_add_on_demand_to_product_and_variant.spree.rb
@@ -0,0 +1,7 @@
+# This migration comes from spree (originally 20121012071449)
+class AddOnDemandToProductAndVariant < ActiveRecord::Migration
+  def change
+  	add_column :spree_products, :on_demand, :boolean, :default => false
+  	add_column :spree_variants, :on_demand, :boolean, :default => false
+  end
+end
diff --git a/db/migrate/20130207043545_split_prices_from_variants.spree.rb b/db/migrate/20130207043545_split_prices_from_variants.spree.rb
new file mode 100644
index 0000000000..f22753470f
--- /dev/null
+++ b/db/migrate/20130207043545_split_prices_from_variants.spree.rb
@@ -0,0 +1,32 @@
+# This migration comes from spree (originally 20121031162139)
+class SplitPricesFromVariants < ActiveRecord::Migration
+  def up
+    create_table :spree_prices do |t|
+      t.integer :variant_id, :null => false
+      t.decimal :amount, :precision => 8, :scale => 2, :null => false
+      t.string :currency
+    end
+
+    Spree::Variant.all.each do |variant|
+      Spree::Price.create!(
+        :variant_id => variant.id,
+        :amount => variant[:price],
+        :currency => Spree::Config[:currency]
+      )
+    end
+
+    remove_column :spree_variants, :price
+  end
+
+  def down
+    prices = ActiveRecord::Base.connection.execute("select variant_id, amount from spree_prices")
+    add_column :spree_variants, :price, :decimal, :after => :sku, :scale => 2, :precision => 8
+
+    prices.each do |price|
+      ActiveRecord::Base.connection.execute("update spree_variants set price = #{price['amount']} where id = #{price['variant_id']}")
+    end
+    
+    change_column :spree_variants, :price, :decimal, :after => :sku, :scale => 2, :precision => 8, :null => false
+    drop_table :spree_prices
+  end
+end
diff --git a/db/migrate/20130207043546_remove_not_null_from_spree_prices_amount.spree.rb b/db/migrate/20130207043546_remove_not_null_from_spree_prices_amount.spree.rb
new file mode 100644
index 0000000000..beb5f7a85f
--- /dev/null
+++ b/db/migrate/20130207043546_remove_not_null_from_spree_prices_amount.spree.rb
@@ -0,0 +1,10 @@
+# This migration comes from spree (originally 20121107003422)
+class RemoveNotNullFromSpreePricesAmount < ActiveRecord::Migration
+  def up
+    change_column :spree_prices, :amount, :decimal, :precision => 8, :scale => 2, :null => true
+  end
+
+  def down
+    change_column :spree_prices, :amount, :decimal, :precision => 8, :scale => 2, :null => false
+  end
+end
diff --git a/db/migrate/20130207043547_add_currency_to_line_items.spree.rb b/db/migrate/20130207043547_add_currency_to_line_items.spree.rb
new file mode 100644
index 0000000000..b0732ee630
--- /dev/null
+++ b/db/migrate/20130207043547_add_currency_to_line_items.spree.rb
@@ -0,0 +1,6 @@
+# This migration comes from spree (originally 20121107184631)
+class AddCurrencyToLineItems < ActiveRecord::Migration
+  def change
+    add_column :spree_line_items, :currency, :string
+  end
+end
diff --git a/db/migrate/20130207043548_add_currency_to_orders.spree.rb b/db/migrate/20130207043548_add_currency_to_orders.spree.rb
new file mode 100644
index 0000000000..d84bc3b7cc
--- /dev/null
+++ b/db/migrate/20130207043548_add_currency_to_orders.spree.rb
@@ -0,0 +1,6 @@
+# This migration comes from spree (originally 20121107194006)
+class AddCurrencyToOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :currency, :string
+  end
+end
diff --git a/db/migrate/20130207043549_add_cost_currency_to_variants.spree.rb b/db/migrate/20130207043549_add_cost_currency_to_variants.spree.rb
new file mode 100644
index 0000000000..a31b96499d
--- /dev/null
+++ b/db/migrate/20130207043549_add_cost_currency_to_variants.spree.rb
@@ -0,0 +1,6 @@
+# This migration comes from spree (originally 20121109173623)
+class AddCostCurrencyToVariants < ActiveRecord::Migration
+  def change
+    add_column :spree_variants, :cost_currency, :string, :after => :cost_price
+  end
+end
diff --git a/db/migrate/20130207043551_add_last_ip_to_spree_orders.spree.rb b/db/migrate/20130207043551_add_last_ip_to_spree_orders.spree.rb
new file mode 100644
index 0000000000..e85fc41ffe
--- /dev/null
+++ b/db/migrate/20130207043551_add_last_ip_to_spree_orders.spree.rb
@@ -0,0 +1,6 @@
+# This migration comes from spree (originally 20121126040517)
+class AddLastIpToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :last_ip_address, :string
+  end
+end
diff --git a/db/migrate/20130207043552_add_display_on_to_spree_payment_methods.spree.rb b/db/migrate/20130207043552_add_display_on_to_spree_payment_methods.spree.rb
new file mode 100644
index 0000000000..240870bbb6
--- /dev/null
+++ b/db/migrate/20130207043552_add_display_on_to_spree_payment_methods.spree.rb
@@ -0,0 +1,10 @@
+# This migration comes from spree (originally 20130114053446)
+class AddDisplayOnToSpreePaymentMethods < ActiveRecord::Migration
+  def self.up
+    add_column :spree_payment_methods, :display_on, :string
+  end
+
+  def self.down
+    remove_column :spree_payment_methods, :display_on
+  end
+end
diff --git a/db/migrate/20130207043553_add_position_to_product_properties.spree.rb b/db/migrate/20130207043553_add_position_to_product_properties.spree.rb
new file mode 100644
index 0000000000..93da5d87b1
--- /dev/null
+++ b/db/migrate/20130207043553_add_position_to_product_properties.spree.rb
@@ -0,0 +1,7 @@
+# This migration comes from spree (originally 20130120201805)
+class AddPositionToProductProperties < ActiveRecord::Migration
+  def change
+    add_column :spree_product_properties, :position, :integer, :default => 0
+  end
+end
+
diff --git a/db/migrate/20130207043554_add_api_key_to_spree_users.spree_api.rb b/db/migrate/20130207043554_add_api_key_to_spree_users.spree_api.rb
new file mode 100644
index 0000000000..b9e3fe3884
--- /dev/null
+++ b/db/migrate/20130207043554_add_api_key_to_spree_users.spree_api.rb
@@ -0,0 +1,8 @@
+# This migration comes from spree_api (originally 20100107141738)
+class AddApiKeyToSpreeUsers < ActiveRecord::Migration
+  def change
+    unless defined?(User)
+      add_column :spree_users, :api_key, :string, :limit => 40
+    end
+  end
+end
diff --git a/db/migrate/20130207043555_spree_promo_one_two.spree_promo.rb b/db/migrate/20130207043555_spree_promo_one_two.spree_promo.rb
new file mode 100644
index 0000000000..7e808c800b
--- /dev/null
+++ b/db/migrate/20130207043555_spree_promo_one_two.spree_promo.rb
@@ -0,0 +1,46 @@
+# This migration comes from spree_promo (originally 20120831092359)
+class SpreePromoOneTwo < ActiveRecord::Migration
+  def up
+    # This migration is just a compressed migration for all previous versions of spree_promo
+    return if table_exists?(:spree_products_promotion_rules)
+
+    create_table :spree_products_promotion_rules, :id => false, :force => true do |t|
+      t.references :product
+      t.references :promotion_rule
+    end
+
+    add_index :spree_products_promotion_rules, [:product_id], :name => 'index_products_promotion_rules_on_product_id'
+    add_index :spree_products_promotion_rules, [:promotion_rule_id], :name => 'index_products_promotion_rules_on_promotion_rule_id'
+
+    create_table :spree_promotion_action_line_items, :force => true do |t|
+      t.references :promotion_action
+      t.references :variant
+      t.integer    :quantity,            :default => 1
+    end
+
+    create_table :spree_promotion_actions, :force => true do |t|
+      t.references :activator
+      t.integer    :position
+      t.string     :type
+    end
+
+    create_table :spree_promotion_rules, :force => true do |t|
+      t.references :activator
+      t.references :user
+      t.references :product_group
+      t.string     :type
+      t.timestamps
+    end
+
+    add_index :spree_promotion_rules, [:product_group_id], :name => 'index_promotion_rules_on_product_group_id'
+    add_index :spree_promotion_rules, [:user_id], :name => 'index_promotion_rules_on_user_id'
+
+    create_table :spree_promotion_rules_users, :id => false, :force => true do |t|
+      t.references :user
+      t.references :promotion_rule
+    end
+
+    add_index :spree_promotion_rules_users, [:promotion_rule_id], :name => 'index_promotion_rules_users_on_promotion_rule_id'
+    add_index :spree_promotion_rules_users, [:user_id], :name => 'index_promotion_rules_users_on_user_id'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f0bdd176bc..a35dd39545 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130207043047) do
+ActiveRecord::Schema.define(:version => 20130207043555) do
 
   create_table "cms_blocks", :force => true do |t|
     t.integer  "page_id",    :null => false
@@ -296,6 +296,7 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
     t.string  "iso3"
     t.string  "name"
     t.integer "numcode"
+    t.boolean "states_required", :default => true
   end
 
   create_table "spree_credit_cards", :force => true do |t|
@@ -351,6 +352,7 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
     t.datetime "updated_at",                                       :null => false
     t.integer  "max_quantity"
     t.integer  "shipping_method_id"
+    t.string   "currency"
   end
 
   add_index "spree_line_items", ["order_id"], :name => "index_line_items_on_order_id"
@@ -420,6 +422,8 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
     t.string   "email"
     t.text     "special_instructions"
     t.integer  "distributor_id"
+    t.string   "currency"
+    t.string   "last_ip_address"
   end
 
   add_index "spree_orders", ["number"], :name => "index_orders_on_number"
@@ -433,6 +437,7 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
     t.datetime "deleted_at"
+    t.string   "display_on"
   end
 
   create_table "spree_payments", :force => true do |t|
@@ -474,6 +479,12 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
 
   add_index "spree_preferences", ["key"], :name => "index_spree_preferences_on_key", :unique => true
 
+  create_table "spree_prices", :force => true do |t|
+    t.integer "variant_id",                               :null => false
+    t.decimal "amount",     :precision => 8, :scale => 2
+    t.string  "currency"
+  end
+
   create_table "spree_product_groups", :force => true do |t|
     t.string "name"
     t.string "permalink"
@@ -500,8 +511,9 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
     t.string   "value"
     t.integer  "product_id"
     t.integer  "property_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+    t.integer  "position",    :default => 0
   end
 
   add_index "spree_product_properties", ["product_id"], :name => "index_product_properties_on_product_id"
@@ -516,7 +528,7 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
   add_index "spree_product_scopes", ["product_group_id"], :name => "index_product_scopes_on_product_group_id"
 
   create_table "spree_products", :force => true do |t|
-    t.string   "name",                 :default => "", :null => false
+    t.string   "name",                 :default => "",    :null => false
     t.text     "description"
     t.datetime "available_on"
     t.datetime "deleted_at"
@@ -525,12 +537,13 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
     t.string   "meta_keywords"
     t.integer  "tax_category_id"
     t.integer  "shipping_category_id"
-    t.datetime "created_at",                           :null => false
-    t.datetime "updated_at",                           :null => false
+    t.datetime "created_at",                              :null => false
+    t.datetime "updated_at",                              :null => false
     t.integer  "count_on_hand",        :default => 0
     t.integer  "supplier_id"
     t.boolean  "group_buy"
     t.float    "group_buy_unit_size"
+    t.boolean  "on_demand",            :default => false
   end
 
   add_index "spree_products", ["available_on"], :name => "index_products_on_available_on"
@@ -780,6 +793,7 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
     t.datetime "remember_created_at"
     t.string   "spree_api_key",          :limit => 48
     t.datetime "reset_password_sent_at"
+    t.string   "api_key",                :limit => 40
   end
 
   add_index "spree_users", ["email"], :name => "email_idx_unique", :unique => true
@@ -797,8 +811,9 @@ ActiveRecord::Schema.define(:version => 20130207043047) do
     t.integer  "count_on_hand",                               :default => 0
     t.decimal  "cost_price",    :precision => 8, :scale => 2
     t.integer  "position"
-    t.decimal  "price",         :precision => 8, :scale => 2,                    :null => false
     t.integer  "lock_version",                                :default => 0
+    t.boolean  "on_demand",                                   :default => false
+    t.string   "cost_currency"
   end
 
   add_index "spree_variants", ["product_id"], :name => "index_variants_on_product_id"