fixed a bug in collision detection and added drawing of collision boxes for debugging
Merge branch 'master' of https://github.com/ninjinx/nadeplanet