Moved integration of trajectories before collision handling, and added position adjustment in case of collisions.

This results in more realistic bounces and eliminates the chance of compenetration.