Merge branch 'master' of https://github.com/worklist/hifi into recursive_voxel_delete
Merge branch 'master' of https://github.com/worklist/hifi into recursive_voxel_delete
Merge branch 'master' of https://github.com/worklist/hifi into recursive_voxel_delete
Merge pull request #504 from ZappoMan/recursive_voxel_delete

Just trying to get my branches in sync - no changes
cleaned up menus slightly
Merge pull request #505 from ZappoMan/master

Clean up menus slightly
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation