check for gl2 header when checking for GLES
vnsi5: confluence color fixes
Merge pull request #1 from FernetMenta/master

Merge FernetMenta branch