Fix the collision function
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine