Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
changes to allow AudioInjectorOptions to operate as a hash from js
update airGuitar.js to new AudioInjectionOptions format
update audioBall to new hash injector format
update avatarCollision to new hash injector format
update birdSongs to new injector hash format
Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool

Conflicts:
	examples/newEditEntities.js
Merge pull request #3750 from Atlante45/reverb_for_own_voice

Reverb for own voice
repairs to audio classes for Sound* to QScriptValue
repairs to birdSongs for new hash injector format
repairs to bot_procedrual for hash injector options format
fix for playSound argument to match QScriptValue conversion
use new AudioInjectionOptions format in botProceduralWayPoints
use hash in place of AudioInjectionOptions in other js files
replace AudioInjectionOptions with hash in playSoundOnEnterOrLeave
handle passing of local audio interface to AudioInjector
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
Add back XZ constraining to entity edit tools
Merge branch 'master' of https://github.com/worklist/hifi
first cut at preload script behavior