guiuppdatering

fixa buggar
Merge branch 'master' into Tobias
nada
Merge branch 'Tobias'