Merge branch 'sound_22' of github.com:jappeace/hw-isgp-kbs into sound_remerge

Conflicts:
	ISGPKBS/Game/Game.vcxproj
	ISGPKBS/Game/Window.cpp
Fixed timeformatter
Fixed filter file
remerged sounds
Merge branch 'testing' of github.com:jappeace/hw-isgp-kbs into testing

Conflicts:
	ISGPKBS/Game/Game.vcxproj
	ISGPKBS/Game/TimeFormatter.h
	ISGPKBS/Game/Window.cpp
put back old player