first commit
Merge https://github.com/vrolok/tango-django