settings fix
Merge remote-tracking branch 'origin/master' into VidarBranch
Merge branch 'master' of https://github.com/Calleberg/Operation_5A