Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows
fixes/patches for win32/vs2013 startup and shutdown
Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows
Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows
Merge pull request #3389 from chansensturm/audio-windows

Windows/VS2013 Hot Fix