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
Added timer so one bot doesn’t talk twice at same time
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