Kabam Django-fied
Merge branch 'jon'