Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
merge
Merge branch 'master' of https://github.com/worklist/hifi
Added Freddy’s 50 cocktail party clips
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
When we send data to the avatar mixer, send the tweaked head rotation.  Closes
Merge branch 'master' of https://github.com/highfidelity/hifi
Added timer so one bot doesn’t talk twice at same time
Merge pull request #2149 from ZappoMan/octree_server_scaling

Octree server scaling improvements
Merge branch 'master' of https://github.com/highfidelity/hifi
avatar billboards match body/head
Merge pull request #2152 from PhilipRosedale/master

Correct billboards on bots, audio doesn't double play, 50 voice clips!
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge pull request #2151 from ey6es/master

Fix for head rotation tweaking.