Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
memset to 0 in VoxelNode to address potential memory corruption
Fix for Qt 5.2 beta
added decodeOctCode to voxel-edit
Merge branch 'master' of https://github.com/worklist/hifi into voxel_edit
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
Fix for pupil dilation on Ryan's face.
Added a slider in the preferences to control the amount of Faceshift eye
deflection.
Merge pull request #1268 from ey6es/master

Fix for pupil dilation on Ryan's face.
fix to crash on deleteNotify
Merge pull request #1270 from ZappoMan/bugfixes

fix to crash on deleteNotify
Rudimentary Sixense (Razer Hydra) support.
Missed the actual files.
fix macos menu placement for About, Preferences, and Quit
first cut at compresses voxel packets
Optional compilation for Sixense.
Gitignore additions.
Path fix for readme.
Drive avatar with Sixense joysticks and triggers.