Merge pull request #1 from divio/master

sync django-shop