merged from beta
Merge branch 'master' of github.com:SverigesRiksdag/intranetgui

merged beta