Edit assessment type properties
SSO: fix redirect issue based on userspace
Merge branch 'dev'