conflict resolution: serializer + weird adam regular expression for south...
Finished Invoice model + created migration for it
Fixed bug: misspelled field + added 'listing_' to invoice product array index
Merge pull request #1 from xesco/invoice_changes

Invoice changes
Coupons and listing costs
migration chg_field_order_fraud_state__chg_field_order_transaction_id
Don't remove order items unless new items are sent in request body
Fixed invoice generation + uppsell migration
Merge pull request #2 from xesco/fix_invoice_generation

Fixed invoice generation + uppsell migration
pre_transition(), post_transition(): filter by key
Merge branch 'master' of github.com:upptalk/uppsell
Calculated order total with coupon discount
Create user via API
Add models.Address.province_code
Order Admin
BUG: set order-items unmodifiable after payment complete or order cancelled
Urn tests
Remove product-codes, add 'no-payment-required' payment event
Coupons can optionally be applied to shipping costs
'no_payment' state and order events and callbacks