Merge remote-tracking branch 'origin/master' into Renderer
Merge branch 'platfrom' into Renderer
Finished initial Camera class
Finished basic texture class

+ some modifications to Platform/Graphics
Merge remote-tracking branch 'origin/resources' into Renderer

Conflicts:
	src/Audio/Sound.cpp
	vs2010/TestProject/main.cpp
Modified Texture to use ResourceManager
Merge branch 'core' into Renderer

Conflicts:
	src/Platform/Graphics.cpp
Merge branch 'platfrom' into Renderer
Tested texture drawing

- Added new uniform function for glUniform1i
- Fixed GL_TEXTURE enum/abstraction
- Fixed setting uv-coordinates to shader
- Changed smooth and repeat functions in Texture.cpp
- Changed shader to use texture
- Added (probably) correct texture coordinates to TestProject
- Added texture loading to TextureProject
- Added a test texture
Fixed and cleaned Texture
Use alpha in test project
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
Moved external library loading to TestProject and fixed release build
Merge branch 'Renderer'
Merge branch 'master' into platfrom
Added more Graphics stuph