updated collision detection with new combined velocity and position checks, should fix some problems
Merge branch 'dev' of https://github.com/davidbeermann/econarchy into dev