Merge branch 'master' of github.com:worklist/hifi
Merge branch 'master' of github.com:worklist/hifi
fix for collisions when wearing Oculus
Merge branch 'master' of github.com:worklist/hifi
Have the local avatar glow when moving.
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	interface/src/avatar/Avatar.cpp
Merge branch 'master' of github.com:worklist/hifi
moved voxel sending into a GenericThread derived class/object
Revert "moved voxel sending into a GenericThread derived class/object"

This reverts commit 533a8ff31fd93a6c0ab01605d49a93fd8aeb7daf.
moved voxel sending into a GenericThread derived class/object
add an assignment class and begin to hookup AS
Glow when moving.
send assignment from domain server for audio mixer if it isn't present
Merge pull request #884 from ey6es/master

Have the avatars glow when moving.
send correctly sized packet for assignment
store senderSocket with assignment to be passed to requestor
add a stubbed assignment client to request assignments
decouple AM logic from main.cpp to be assignable
Argh, forgot to return the result of the superclass implementation.
Fixed glBuffers not deleted in VoxelSystem