Merge branch 'master' of github.com:noorus/glacier2

Conflicts:
	glacier2/src/Sound.cpp
	hdrlib
Merge branch 'master' of github.com:noorus/glacier2

Conflicts:
	glacier2/src/Sound.cpp