adding SPHforce stuff
Merge branch 'collisions'