Removed OpenGL Shaders
Merge branch 'master' into nonQtEvents