Merge branch 'master' of https://github.com/libgdx/libgdx

Conflicts:
	CHANGES
	tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
Merge branch 'master' of https://github.com/mattdesl/libgdx into bmfont-writer

Conflicts:
	CHANGES