enabling openglES point sprites
Merge branch 'master' of github.com:openframeworks/openFrameworks
ofGstVideoPlayer: fix alpha formats for gst 0.10
ofGLProgrammableRenderer: ifndef PROGRAM_POINT_SIZE for GLES
CHANGELOG: update to include point sprites fix for openGL3
android makefile: fix libraries order
Merge branch 'master' of github.com:joshuajnoble/openFrameworks

Conflicts:
	libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp
android: videograbber use external texture, should fix #2662
CHANGELOG
ofBaseVideoGrabber add getTexture() * for grabbers that support internal texture
glfw: updated to latest version + drag & drop patch
glfw: osx binary updated to latest version
osx glfw 32bits
glfw: linux32 updated to latest version
Merge branch 'bugfix-glfwupdate' of github.com:arturoc/openFrameworks into bugfix-glfwupdate
glfw: latest for win_cb
ofGstVideoPlayer: fix 0.10 bpp
glfw vs updated to latest version
Merge branch 'bugfix-glfwupdate' of github.com:arturoc/openFrameworks
CHANGELOG: updated GLFW