rework studio collisions
Merge pull request #778 from code-dot-org/studioCollide

rework studio collisions