Uses swappable user model if possible
Made user model more obvious that it is not a class but signature
User model changed in addressmodel app as well
FIX: #213 Deleting cart item view should not raise an error
Added ``data`` as optional JSONField to extra price models.
Added requirement jsonfield
jsonfield>=0.9.4 does not support plain strings, therefore restricted to version 0.9 and 0.9.2
whitespace
added test with unicode strings
Merge branch 'master' into add-data-to-extra-price-fields
Bumped required package jsonfield to version 0.9.6
Merge pull request #216 from jrief/add-data-to-extra-price-fields

Added ``data`` as optional JSONField to extra price models.
show the whole traceback when reraising an ImportError in loader
Merge branch 'master' of https://github.com/divio/django-shop
Merge pull request #219 from piquadrat/feature/better-loader-exceptions

show the whole traceback when reraising an ImportError in loader
Merge branch 'master' of https://github.com/divio/django-shop
Enable customized Order short name
Move impl. of short_name property to BaseOrder
Added a simple payment backend to be used for payments in advance, for instance wire transfer
Fixed string for transactionId