Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine
Conflicts: doomsday/client/include/resource/textures.h doomsday/client/src/resource/texturemanifest.cpp doomsday/client/src/resource/textures.cpp doomsday/client/src/resource/texturescheme.cpp
Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine
Conflicts:
doomsday/client/include/resource/textures.h
doomsday/client/src/resource/texturemanifest.cpp
doomsday/client/src/resource/textures.cpp
doomsday/client/src/resource/texturescheme.cpp