Fixed bug where side collision didn't work when falling
Added predictive collision checking based on where the user is about to end up
Merge branch 'collision'