commiting for merge
GLSurfaceView is now in