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
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
moved each client to its own sending thread
Merge branch 'master' of github.com:worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #888 from ey6es/master

Render the ball heads with the voxeltar bodies.
implementing @problem's proposed changes to menus
CR feedback
Merge pull request #889 from birarda/new-menu

implementing @problem's refactored menu setup
make temporary buffer bound to each sending thread object
Merge pull request #887 from ZappoMan/threaded_voxel_server

Make separate per client threads for sending voxels to each client
Merge branch 'master' of https://github.com/worklist/hifi
updated README to include details on running local domain
Merge pull request #890 from ZappoMan/master

Update README to include details on running local domain, formated 80 char line wrap.