merge changes by bromer
merge changes by bromer

liberation/django-admin-tools,noxan/django-admin-tools,liberation/django-admin-tools,liberation/django-admin-tools,liberation/django-admin-tools,noxan/django-admin-tools,noxan/django-admin-tools