Merge branch 'state_translation_override' of https://github.com/stveep/openfoodnetwork into state_translation_override

config/locales/en-GB.yml

@@ -10,6 +10,12 @@ en-GB:
             password:
               confirmation: you have successfully registered
               too_short: pick a longer name
+    # Overridden here due to a bug in spree i18n (Issue #870)
+    attributes:
+      spree/order:
+        payment_state: Payment State
+        shipment_state: Shipment State
+
   devise:
     failure:
       invalid: |

db/schema.rb

@@ -683,9 +683,9 @@ ActiveRecord::Schema.define(:version => 20160401043927) do
     t.string   "email"
     t.text     "special_instructions"
     t.integer  "distributor_id"
-    t.integer  "order_cycle_id"
     t.string   "currency"
     t.string   "last_ip_address"
+    t.integer  "order_cycle_id"
     t.integer  "cart_id"
     t.integer  "customer_id"
   end