coding standard cleanup
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
fix issue with duplicate VBO slots
Merge pull request #420 from ZappoMan/voxel_animation

Fix to missing voxels