Merge pull request #3625 from ey6es/metavoxels

Fix for Xcode warning.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Basic network simulation for metavoxels.