Merge graphics changes

Requires OpenGL 3.0 and GLEW