knappändringar
fixed issues with merge
Merge remote-tracking branch 'origin/master'