remove numClientsMixedInFrame since it is no longer used
Merge pull request #2447 from birarda/master

remove an unused variable
fix some windows issues

Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
revert
revert
whitespace cleanup
Merge pull request #2451 from ZappoMan/windows_fixes

Windows run time fixes
Merge branch 'master' of https://github.com/worklist/hifi into js_prefs