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'
Merge pull request #775 from ZappoMan/multiple_voxel_servers

added more color groups for false colorization from source
improved particle rainbow color cycle mode
merge
added BendyLine
Render a green plane with fog, per Grayson's request.
Merge branch 'master' of https://github.com/worklist/hifi into pointy
Merge branch 'master' of https://github.com/worklist/hifi into particles
Fix for GCC warning.  #import?
Merge pull request #778 from ey6es/master

Fix for GCC warning.  Someone in Java mode?
  removed 3 magic numbers in particle system
Merge pull request #776 from ey6es/pointy

Render a green plane with fog, per Grayson's request.