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
implementing @problem's proposed changes to menus
Merge pull request #889 from birarda/new-menu

implementing @problem's refactored menu setup