Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
add marker spheres at 1 meter away from origin for better avatar size testing
Merge branch 'master' of https://github.com/worklist/hifi
change node types of interest to a QSet
Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set
move some of the node interest additions to correct spots
move node interest add for JL to JL
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
move datagram processing back to separate thread
fix crashing particle server bug
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
Merge pull request #1649 from birarda/master

move datagram processing back to separate thread
Merge branch 'master' of https://github.com/worklist/hifi
use NodeList getNodeHash getter for methods that can be called from other threads
Merge pull request #1650 from ZappoMan/bugfixes

Fix crash in particle server
Merge branch 'master' of https://github.com/worklist/hifi