don't return an iterator from killNodeAtHashIterator
Merge branch 'master' of https://github.com/worklist/hifi into nodelist-container
have the Agent ask for an audio-mixer for audio scripting
Merge pull request #1538 from birarda/nodelist-container

don't return an iterator from killNodeAtHashIterator
Merge branch 'master' of git://github.com/worklist/hifi into windows_build

Conflicts:
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h