Work in progress
Merge branch 'user_admin' into new_frontend
Integration of the logged in user