Merge branch 'master' of https://github.com/libgdx/libgdx into bmfont-writer

Conflicts:
	gdx/src/com/badlogic/gdx/graphics/g2d/BitmapFont.java
Merge branch 'bmfont-writer' of https://github.com/mattdesl/libgdx into freetype-filters