cropped settings image
Merge branch 'master' into rapportbranch-nina