Merge branch 'master' of https://github.com/worklist/hifi into 19437
#19437  Adjust bandwith meter to be fixed width, not rescaling
Faceshift fail to connect only notifies log once
Merge branch 'master' of https://github.com/worklist/hifi
fix for preferences bug on 5.1.1
cleaup some unecessary defaults in Menu
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
Merge branch 'master' of https://github.com/worklist/hifi into 19437
Merge pull request #1093 from stojce/19437

Code Review for Job #19437
Merge pull request #1090 from PhilipRosedale/master

Faceshift only notifies log on first fail to connect
Merge branch 'master' of github.com:worklist/hifi into assignment
initial changes to allow for multiple buffers per client