First commit
Merge https://github.com/KeeeN/django_hero