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
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
Fixed string for transactionId
Merge pull request #221 from jrief/add-prepayment-backend

Added a simple payment backend to be used for payments in advance
Merge pull request #209 from atheiste/master

Uses new swappable user
Merge branch 'fix-213-deleting-cart-item' of https://github.com/bmihelac/django-shop into bmihelac-fix-213-deleting-cart-item

Conflicts:
	shop/views/cart.py
Merge branch 'master' of github.com:divio/django-shop
Drop support for Django 1.3.
Merge pull request #224 from anderspetersson/master

Drop support for Django 1.3
Added Anders to AUTHORS! Thanks a lot!
Merge pull request #220 from jacekmitrega/0.1.2-order-short-name

Enable customized Order short name