initial commit
Merge https://github.com/Gorah/BDWDjango