reduce elasticity to be less than 1
Merge branch 'elasticity' of https://github.com/PhilipRosedale/hifi into elasticity-fix

Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
Minor cast enforcement during initialization.