GlutDisplay now working using GLSL.
main can now display GlutDisplay or GLFWDisplay.
Merge branch 'openGL2' into qtOpenGL2