minor change in shader
simplified shaders for debugging on MAC
Merge branch 'master' into displayparticles