added switch for openGL ES v2.0 - displays a rainbow rectangle
Merge branch 'OpenGLESv2' into gpuimage

Conflicts:
	OpenGLDemo/GLView.m
	OpenGLESDemo.xcodeproj/project.pbxproj
manually resolve pbxproj conflicts