Integration

Markrequested to merge
integration into master

Changes that needed to be made in order to integrate the user-panel into the single sign on environment

Merge request reports