Updated shaders to load uniform locations and names when they are loaded.
Merge remote-tracking branch 'origin' into Shader
minor adjustments to time, added comments to shader and removed printing line