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 remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/worklist/hifi into pointy
Merge remote-tracking branch 'upstream/master'
Render a green plane with fog, per Grayson's request.
Merge branch 'master' of https://github.com/worklist/hifi into pointy
Fix for GCC warning.  #import?
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
Rave glove demo: Network rave data
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
- Smooth rescaling
- stop following when leading avatar disconnect
- set max far clip for no more crash with really big avatars
Merge pull request #781 from machinelevel/dev4

Rave glove demo: Network rave data
Merge remote-tracking branch 'upstream/master' into particles