SKP to SVO research
Revert "SKP to SVO research"

This reverts commit b8a4d853d36f5c8ac80cdaf00dc4cf25b3135a04.
SKP to SVO import research
Merge branch 'master' of https://github.com/stojce/hifi
Revert "SKP to SVO import research"

This reverts commit 8562172584e0ba5bd562bc1c117e66ea856c451c.
Merge branch 'master' of https://github.com/stojce/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
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
fix issue with voxel server getting duplicate nodes
Merge pull request #883 from ZappoMan/threaded_voxel_server

fix issue with voxel server getting duplicate nodes
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.