Created shader_map for handling shaders - less global variables
Added uniform1i and uniform1f functions to facilitate changing shader uniforms.
Saving current state
Merge branch 'develop' into glow
Alternate shader
Glow Effect
Merge branch 'glow' into develop