Doomsday Engine

Merge branch 'master' into remove-sdlnet

Conflicts:
.gitignore
distrib/win32/setup.iss.template
doomsday/build/build.pro
doomsday/config.pri
doomsday/dep_sdl.pri
doomsday/engine/engine.pro
doomsday/engine/portable/include/sv_def.h
doomsday/engine/portable/include/sys_network.h
doomsday/engine/portable/src/gl_png.c
doomsday/engine/portable/src/m_huffman.c
doomsday/engine/portable/src/net_buf.c
doomsday/engine/portable/src/net_main.c
doomsday/engine/portable/src/sys_network.c
doomsday/engine/unix/src/dd_uinit.c
doomsday/engine/win32/src/dd_winit.c