More collision handling
Merge branch 'graphics' into physics

Merge in octree fix
Merge remote-tracking branch 'origin/physics' into graphics