various particle crash and deadlock fixes
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
more octree locking cleanup
removed some debug
Merge pull request #2175 from ZappoMan/bugfixes

Fixes to particle deadlock, and some other crashes
Merge branch 'master' of https://github.com/highfidelity/hifi
Tie the avatar LOD distance multiplier to the LOD parameter calculated for
voxels.