Changed fragment shader in triangle test to make it compatible with GLSL 1.2
Merge branch 'master' into newWindowGL

Conflicts:
	test/triangle/src/shaders/fTriangleShader.fragment