Remove xadmin as it will not work with guardian.
Merge branch 'master' of https://github.com/weijia/djangoautoconf

Conflicts:
	djangoautoconf/auto_conf_admin_utils.py