Initial django project.
Merge remote-tracking branch 'upstream/master' into just_test