solved aliasing lines in toon shader
Merge branch 'master' into soft-shadows
Darius Fix for weird diffuse colour.

Conflicts:
	shaders/DS_lightPass.frag