fixed up
Merge remote-tracking branch 'origin/master'

Conflicts:
	backends/gdx-backend-jglfw/src/com/badlogic/gdx/backends/jglfw/JglfwGL10.java
fixed up