merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of git://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
add method to clear the NodeList
Merge branch 'master' of https://github.com/worklist/hifi into master-old
Merge branch 'master' of https://github.com/worklist/hifi
add method to NodeList to set domain IP to local, move mutex lock to node
update the private mutex node variable to standard
correct reference to mutex to lock in Node
conditionally set a new hostname on preferences save
lock on the solo voxelServer before deleting local voxels
lock the voxel server when receiving data to avoid race crash
lock the audioMixer to avoid crash when grabbing socket