fixed the y collisions completely (no falling through objects when colliding an object above any more!)
Merge remote-tracking branch 'origin/master'