Compile fix (for me, anyway).
Merge pull request #1608 from ey6es/master

Compile fix (for me, anyway).
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
More work on metavoxel editing (grid, etc.)