fix
fix
push
Merge branch 'hotfix/hjelp'
Merge commit 'hjelp' into develop