Merge branch 'master' into crumble-FOF

CMakeLists.txt

SRB2.cbp

appveyor.yml

debian/docs

src/CMakeLists.txt

src/Makefile

src/android/i_system.c

src/blua/Makefile.cfg

src/console.c

src/console.h

src/d_clisrv.c

src/d_clisrv.h

src/d_main.c

src/d_net.c

src/d_net.h

src/d_netcmd.c

src/d_netcmd.h

src/d_netfil.c

src/d_netfil.h

src/d_player.h