Merge remote-tracking branch 'origin/nfr/integrasjon'
Merge remote-tracking branch 'origin/master' into nfr/integrasjon