fix bug
Merge branch 'master' of github.com:waitingzeng/django-xadmin