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
Merge branch 'master' of github.com:worklist/hifi
Render the ball heads with the voxeltar bodies.
Merge pull request #888 from ey6es/master

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

implementing @problem's refactored menu setup
Merge branch 'master' of github.com:/worklist/hifi