Merge branch 'master' of https://github.com/grandocu/python-django-setup
Merge branch 'master' of https://github.com/grandocu/python-django-setup