correct OctreeServer config parsing
domain-server patches while looking for payload/pool errors
Merge branch 'master' of https://github.com/highfidelity/hifi
remove assignmentQueueMutex now that DS concurrency is gone
remove an extra gs
domain-server patches while looking for payload/pool errors
add QDataStream >> operator to Assignment
support for global collision callbacks in JS
Merge branch 'master' of https://github.com/worklist/hifi into scripting_work

Conflicts:
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
	libraries/voxels/src/VoxelEditPacketSender.cpp
fix header comment
implement a basic exampple of ride along with a particle
use a proper string list in DataServer for values
add easier support for key codes in JS by adding text property and auto-detecting isShifted
add easier support for key codes in JS by adding text property and auto-detecting isShifted
implement a basic exampple of ride along with a particle
fix appending of QString value to valueList
Fixes for parsing FBX text encoding.
Merge pull request #1763 from birarda/master

use a proper string list in DataServer for values
#19493 - @ function can jump to locations as well as avatars
Merge branch 'master' of https://github.com/worklist/hifi into 19493