Merge branch 'master' of github.com:zombiepaladin/Awe into Picking_With_Instancing

Conflicts:
	Engine/Audio/Debug/Engine.Audio.log
	Engine/Core/Debug/Engine.Core.log
	Engine/Engine.vcxproj
	Engine/Engine.vcxproj.filters
	Engine/GameFoundation/Debug/Engine.GameFoundation.log
	Engine/InputManager/Debug/Awe.Engine.InputManager.log
	Engine/Rendering/Debug/Engine.Rendering.log
	Engine/ResourceManager/Debug/Engine.Resources.log
	Engine/textureclass.cpp
	Engine/textureclass.h
	media/cube/skytemple.xnb