Merge branch 'unstable' into renderer_material
Merge branch 'renderer_material' of https://github.com/OpenGameDevelopers/ZED into renderer_material
|SOURCE|
[Common::Renderer::OGL::GLShaderMaterial]
* Re-named m_NameMap to m_ShaderConstantsNameMap to make it more readily
  understandable as to what it does
[Common::Renderer::ShaderMaterial]
* Added a shader member variable
|MERGE|
renderer_material of https://github.com/OpenGameDevelopers/ZED into renderer_material
|SOURCE|
[ZED::Renderer::OGL::GLShaderMaterial]
* Fixed the compiler error about GLuint by adding the RenderTypes header