Merge branch 'platfrom' into core
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
ResourceManager includes typedefs-header.

Fixed using duplicate audio.
Changed FreeGLUT to GLFW

Also fixed some types and enums.
Forgot to call makeCurrent
Fixed a bug in context version changing.
Merge branch 'sound' into platfrom

Conflicts:
	src/Audio/Audio.cpp
	src/Audio/Sound.cpp
	vs2010/TestProject/main.cpp
Merge remote-tracking branch 'origin/resources' into platfrom

Conflicts:
	vs2010/Platform/Platform.vcxproj.filters
	vs2010/TestProject/main.cpp
Merge branch 'core' of https://github.com/Team-Innis/UtH-Engine into core
Merge branch 'core' into platfrom
Fixed some window functions
Test loading 2 textures
Fixed multiple differend named texture & wav loading.
Merge remote-tracking branch 'origin/resources' into Renderer

Conflicts:
	src/Audio/Audio.cpp
	src/Audio/Sound.cpp
	vs2010/Platform/Platform.vcxproj.filters
	vs2010/TestProject/main.cpp
Merge branch 'platfrom' into Renderer

Conflicts:
	src/Audio/Sound.cpp
	vs2010/TestProject/main.cpp
Fixed merge