Basic-41013
Merge branch 'master' of github.com:christian6/django-upicr