Merge branch 'resources' into sound
Fixed sounds.

Made debug functions as static.
Made testproject play sound test.
Fixed sounds.
Fixing main so can merge?
Merge branch 'sound' into resources

Conflicts:
	vs2010/TestProject/main.cpp