added decodeOctCode to voxel-edit
Merge branch 'master' of https://github.com/worklist/hifi into voxel_edit
fix macos menu placement for About, Preferences, and Quit
fix to crash in client side VoxelSceneStats crash
fix a couple of bugs in display of voxel stats on server status
Merge pull request #1281 from ZappoMan/voxel_stats

fix a couple of bugs in display of voxel stats on server status
Merge pull request #1276 from ZappoMan/voxel_edit

Add --decodeOctalCode to voxel-edit
Merge pull request #1271 from ZappoMan/fix_menus

fix macos menu placement for About, Preferences, and Quit
Merge pull request #1272 from ZappoMan/stats_crash_bug_fix

fix to crash in client side VoxelSceneStats crash
Merge branch 'master' of https://github.com/worklist/hifi into shadowplay