fixes to django conventions
Merge branch 'develop'