update
Merge branch 'master' of https://github.com/zodman/django-shop
update