collisiondetection step 1
Merge branch 'masterlocal' of https://github.com/pgergq/deformation.git