Doomsday Engine

Merge branch 'master' into resourcesystem

Conflicts:
doomsday/client/include/dd_pinit.h
doomsday/client/include/de_render.h
doomsday/client/include/render/r_main.h
doomsday/client/src/clientapp.cpp
doomsday/client/src/dd_main.cpp
doomsday/client/src/dd_pinit.cpp
doomsday/client/src/gl/gl_texmanager.cpp
doomsday/client/src/render/fx/vignette.cpp
doomsday/client/src/render/r_main.cpp
doomsday/client/src/render/r_things.cpp
doomsday/client/src/render/sprite.cpp
doomsday/client/src/resource/materialvariant.cpp
doomsday/client/src/resource/models.cpp
doomsday/libdeng2/include/de/math.h