Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
improved particle rainbow color cycle mode
merge
added BendyLine
Merge branch 'master' of https://github.com/worklist/hifi into particles
  removed 3 magic numbers in particle system
Render other avatar's lookat to point at my camera if the other avatar
is looking at my head.
Merge pull request #783 from LionTurtle/master

Render other avatar's lookat to point at my camera if the other avatar is looking at my head.
Merge pull request #777 from Ventrella/particles

Added BendyLine
Merge branch 'master' of https://github.com/worklist/hifi