Doomsday Engine

Merge branch 'master' of skyjake.fi:doomsday/engine into work/omega

1. Conflicts:
2. doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders.dei
3. doomsday/apps/client/src/def_main.cpp
4. doomsday/apps/client/src/gl/gl_main.cpp
5. doomsday/cmake/Version.cmake
6. doomsday/libs/doomsday/libs/importidtech1/src/mapimporter.cpp
7. doomsday/libs/doomsday/src/defs/dedparser.cpp
8. doomsday/libs/gamekit/libs/common/src/common.cpp
9. doomsday/sdk/libgui/src/graphics/image.cpp
10. doomsday/tools/dshell/src/aboutdialog.cpp
11. doomsday/tools/shell/src/aboutdialog.cpp