added penetration support to particle collisions JS callbacks
Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration

Conflicts:
	libraries/script-engine/src/Vec3.cpp
Merge pull request #2213 from ZappoMan/particle_collions_penetration

added penetration support to particle collisions JS callbacks
Merge branch 'master' of https://github.com/highfidelity/hifi