Squashed commit of the following: commit 583b54ba97f0e0c02bd6665c76e95aabbb4c0bf1 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Sep 10 07:37:32 2021 +0200 Updated role-check and added loader commit 78cd4047b3ad1180c818adeaa29c5a2d567b386e Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 9 16:55:53 2021 +0200 merged in develope, fixed template conflict (TV-517) commit c5d295126f2e9826e95456e28deb276609cb56e3 Merge: 014fdb45f81d6fAuthor: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 9 16:54:26 2021 +0200 merged in develope (TV-517) commit 014fdb4af7df3c8bd8502ee617fce2bf2f0a49cd Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 9 16:49:59 2021 +0200 simplified the code, mapped instead of subscribe (TV-517) commit dbec3796596b6d3e5c483c68e1ffd628a872b1ca Merge: 6ed17c32bca57cAuthor: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 9 15:13:44 2021 +0200 Merge branch 'develop' into feature/TV-517 commit 6ed17c3a01b2261529a793413f455eecd3194fd2 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 9 15:13:07 2021 +0200 fixed error after merge with develop (TV-517) commit e7cd48905bcbff4df24676fd2f2ed5ba214f6e86 Merge: d2833851938b94Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 9 14:53:46 2021 +0200 Merge branch 'develop' into feature/TV-517 commit d283385408bc189bdb4884e397acf9653f54c6d4 Merge: 3ff31c97774477Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 9 14:22:09 2021 +0200 Merge branch 'develop' into feature/TV-517 commit 3ff31c9596a45a32b28a01015d455fc97acd9cf7 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 9 14:19:51 2021 +0200 added specific view for standard user (TV-517) commit 9302f56f7cd9dfe66d70947ac62c8e1fde3cac86 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 9 12:01:08 2021 +0200 added getters for user roles (TV-517)