Merge branch 'thokking-hell' into 'next'

src/deh_tables.c

src/g_demo.c

src/hardware/hw_light.c

src/info.c

src/info.h

src/p_user.c