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