beginning of hook of AudioInjector into JS
replace QVariantMap glm::vec3 setters with conversions for QScriptValue
add methods to set/get samples and volume
Merge branch 'master' of github.com:worklist/hifi into assignment
remove non-sensical comment for assignment client debug changes
Merge branch 'master' of github.com:worklist/hifi into assignment
don’t have AvatarMixer ask DS for agents
handle conflicts on merge with upstream master
allow audio injection from javascript
remove the Agent static instance
remove static instance set from Agent.cpp
Merge pull request #1055 from birarda/assignment

add audio injection from javascript