Updated a lot of stuff
Merge branch 'master' of https://github.com/Bubo1/django_dsw

aegaegag