Update setup.py file
Merge branch 'master' of github.com:sshwsfc/django-xadmin

Conflicts:
	setup.py