Glida mot väggar
Merge branch 'master' into johannes