preset-knap-modul rettelse
Merge remote-tracking branch 'origin/master'