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
Working on object attributes.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
domain-server patches while looking for payload/pool errors
add QDataStream >> operator to Assignment
support for global collision callbacks in JS
Working on editing QObjects.
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
Fix box color on hovering.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Layout fix.
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