fixes
Merge branch 'master' of github.com:Alerion/django_documentation
Merge branch 'master' of github.com:Alerion/django_documentation