Merge branch 'master' into crumble-FOF

src/hardware/hw_main.c

src/m_cheat.c

src/p_map.c

src/p_mobj.c

src/p_setup.c

src/p_spec.c

src/p_user.c

src/r_data.c

src/r_main.c