django files move to sub dir.
Merge remote-tracking branch 'origin/master'