Starting sunlight experimentation branch
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
Add sunlight/lightmap merging by multiply (r_sunlightMode 1)
Merge additive sunlight and map lighting into one GLSL shader (r_sunlightMode 2)
Change single lightmap blends to use lightall
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	code/renderergl2/tr_shade.c