logout, superuser views
merge conflicts