Fixat namnet
Merge branch 'hotfix/hotfix'
Merge branch 'master' into feature/testing_2