Djago repaired
Django app repaired
Merge branch 'django'
Django repaired