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