added shadows to particles
only render local toy ball sphere if there is an actual toy ball
fix compiler warning
Merge branch 'master' of https://github.com/worklist/hifi into edit_particles
Merge pull request #1363 from ZappoMan/edit_particles

Add shadows and only render local toy ball if one has been created
add particle collisions with voxels
Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions
removed some debug
fix crash in collisions
Merge pull request #1365 from ZappoMan/particle_voxel_collisions

Particle voxel collisions
particle to particle collisions
Merge pull request #1366 from ZappoMan/particle_voxel_collisions

particle to particle collisions
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels

Conflicts:
	interface/src/Application.cpp