Fixed #42
Merge branch 'master' of github.com:caktus/django-project-template