updated collision joinpoint
Merge branch 'master' of https://github.com/q41/apc