some fix
Merge branch 'master' of https://github.com/bezbunix/django_up