Keep setup intact for the non-Doom games.
Sort up color matrices.
Whitespace clean up.
strife: Add missing NULL to M_StringJoin call.
Whitespace clean up.

Conflicts:
	src/doom/r_draw.c
	src/v_video.c
Implement colored patches and sprites.
Slightly lighten colormaps so they do not all fade straight to black.
Comment where appropriate and some clean up
Merge https://github.com/chocolate-doom/chocolate-doom
Merge branch 'master' into hicol2

Conflicts:
	src/doom/d_main.c
	src/doom/hu_stuff.c
	src/doom/m_menu.c
	src/doom/r_draw.c
	src/doom/r_things.c
	src/doom/st_stuff.c
	src/m_config.c
	src/setup/compatibility.c
	src/v_video.c
Merge branch 'hicol2' of https://github.com/fabiangreffrath/crispy-doom into hicol2

Conflicts:
	src/doom/hu_stuff.c
	src/doom/m_menu.c
	src/i_video.c
	src/v_video.h