enabling openglES point sprites
Merge branch 'master' of github.com:openframeworks/openFrameworks
Merge branch 'master' of github.com:joshuajnoble/openFrameworks

Conflicts:
	libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp