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

Conflicts:
	tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi

Conflicts:
	tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
Merge branch 'new3dapi' of https://github.com/libgdx/libgdx into new3dapi
Use new model
Merge pull request #310 from xoppa/new3dapi

New3dapi, Bullet