Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
simpler butterflies script that doesn't put as much traffic on entity server
Merge branch 'master' of https://github.com/worklist/hifi
Add ability to set injector properties during playing, and orbitingSound.js
remove debug
Merge pull request #3908 from PhilipRosedale/master

Orbiting sound example, ability to set injector position, better butterflies