Better movement collision and jump
Merge branch 'better-movement' into dev