Fix r_speeds 4 in OpenGL2 renderer
Fix r_nocurves in OpenGL2 renderer

Check r_nocurves in surface cull.
While r_nocurves is enabled, don't use merged surfaces because merged curves would be renderer. (note: surface merging is enabled by r_mergeLeafSurfaces)
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	code/renderergl2/tr_world.c
OpenGL2: ET face/trisurf changes

Allow triangle surfaces to be lightmapped.
Allow face surfaces to have 1024 vertexes instead of 64 and optionally use vertex light.
Add ET foliage support to OpenGL2 renderer

Also add surfMins/surfMaxs from ET.
Increase SHADER_MAX_VERTEXES to 1025 to match ET
Fix R_SetParent changes in OpenGL2 ET foliage commit
Merge remote-tracking branch 'spearmint/master'