Forgot to include GLES/glext.h only if SFML_EMBEDDED_SYSTEM
Don't use the quad primitive type

It's not supported by OpenGL ES, and will be removed in the
future. However, we'll keep the quad primitive around for
the time being and not completely remove it so users can
still use it for custom shapes.
Merge branch 'master' into Android