Merge branch 'master' of https://github.com/worklist/hifi into pointy
Merge branch 'master' of https://github.com/worklist/hifi into pointy
Merge branch 'master' of https://github.com/worklist/hifi into pointy
Merge branch 'master' of https://github.com/worklist/hifi into pointy
Merge branch 'master' of https://github.com/worklist/hifi into pointy
Merge branch 'master' of https://github.com/worklist/hifi into pointy
Render a green plane with fog, per Grayson's request.
Merge branch 'master' of https://github.com/worklist/hifi into pointy
Merge pull request #778 from ey6es/master

Fix for GCC warning.  Someone in Java mode?
Merge pull request #776 from ey6es/pointy

Render a green plane with fog, per Grayson's request.
reset the song mix menu item after clip is done
Merge pull request #779 from birarda/rave-audio

fix resetting of song mix menu item after import is done
Working on upgrading to latest version of Oculus software and adding Linux
support.