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