Doomsday Engine

Merge branch 'master' into ringzero+master

Conflicts:
doomsday/build/win32/doomsday_cl.rsp
doomsday/engine/api/doomsday.def
doomsday/engine/portable/include/net_main.h
doomsday/engine/portable/src/net_main.c
doomsday/engine/portable/src/r_things.c
doomsday/plugins/common/include/d_netsv.h
doomsday/plugins/common/include/g_common.h
doomsday/plugins/common/src/am_map.c
doomsday/plugins/common/src/p_user.c