bucky balls!
Merge branch 'master' of https://github.com/worklist/hifi into buckyballs
removed trigger being used for toy ball catching
merge fixes
removed old ParticleSystem class
Cleanup to move BuckyBalls prototype to own class file
remove unused mohawk and hair physics
add property for volume in AudioInjectorOptions
Merge pull request #1440 from PhilipRosedale/buckyballs

Removed some more old balls/hair/particle code, added local-only version of buckyballs to try playing with
Merge pull request #1448 from birarda/master

add property for volume in AudioInjectorOptions
Tweaked mirror distances
Don’t render head if inside it!
Merge pull request #1449 from PhilipRosedale/mirror

Mirror
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.
Fixing build: missed some instances of VOXEL_ELASTICITY.

Also enforcing C++ style casts.
Merge branch 'master' of https://github.com/worklist/hifi