Untested port to work with desktop GL
Merge branch 'master' into graphics
Bring files from master for updating.
Now compiles for desktop OpenGL.
Removed redundant includes
Fixed redefinition of USE_GLES