Fixed reversion in collision detection
Merge branch 'develop' of https://github.com/warreq/Scamp into develop