fixed up gdx-setup to be a bit less complex
Merge branch 'master' of https://github.com/libgdx/libgdx