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
add easier support for key codes in JS by adding text property and auto-detecting isShifted
Fixes for parsing FBX text encoding.
Another fix for Blender exports.  Closes #1762.
Merge branch 'master' of https://github.com/highfidelity/hifi
removal of persistence in DS for static assignments
fix assignment packing and unpacking from DS to AC
fix config parsing from command line and json
fix unix complaint for no postfix for enum
Merge pull request #1766 from birarda/domain-file

patches to broken domain-server pool and payload passing