Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi

Conflicts:
	tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java

diff --cc tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
index ca1fe3a,55fccaf..9d25e81
--- 1/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
--- 2/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
@@@ -77,9 -77,10 +77,10 @@@ public class GdxTests 
                // SoundTouchTest.class, Mpg123Test.class, WavTest.class, FreeTypeTest.class,\r
                // InternationalFontsTest.class, VorbisTest.class\r
                TextButtonTest.class, TextButtonTestGL2.class, TextureBindTest.class, SortedSpriteTest.class,\r
 -              ExternalMusicTest.class, SoftKeyboardTest.class, DirtyRenderingTest.class, YDownTest.class,
 +              ExternalMusicTest.class, SoftKeyboardTest.class, DirtyRenderingTest.class, YDownTest.class,  BatchRenderTest.class,\r
                ScreenCaptureTest.class, BitmapFontTest.class, LabelScaleTest.class, GamepadTest.class, NetAPITest.class, TideMapAssetManagerTest.class, TideMapDirectLoaderTest.class, TiledMapAssetManagerTest.class, TiledMapBench.class,\r
-               RunnablePostTest.class, Vector2dTest.class, SuperKoalio.class));\r
+               RunnablePostTest.class, Vector2dTest.class, SuperKoalio.class, NinePatchTest.class,\r
 -              JsonModelLoaderTest.class, BatchRenderTest.class));
++              JsonModelLoaderTest.class, BatchRenderTest.class));\r
        \r
        public static List<String> getNames () {\r
                List<String> names = new ArrayList<String>(tests.size());\r