Merge branch 'master' of https://github.com/worklist/hifi into 19437
#19437  Adjust bandwith meter to be fixed width, not rescaling
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
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
show total memory usage for voxels
fix reset of VoxelSystem on eraseAllVoxels()
Faceshift fail to connect only notifies log once
Merge branch 'master' of https://github.com/worklist/hifi
continued STUN requests for keepalive, propagate socket changes
debug a STUN reponse that only changes port
fix for preferences bug on 5.1.1
cleaup some unecessary defaults in Menu
Merge branch 'master' of github.com:worklist/hifi into assignment
add AudioMixerClientData to hold vector of PositionalAudioRingBuffer
Merge pull request #1092 from birarda/master

fix for Qt 5.1.1 preferences bug
Merge pull request #1091 from birarda/assignment

continued STUN requests for keepalive, propagate socket changes
add a stream identifier back to the audio injector
audio injector requires two UUIDs