javadoc
Merge remote-tracking branch 'origin/master'
Refactor city
moved OIS wrapper to its own package, added simple test
gdx-controllers
Merge remote-tracking branch 'origin/master'

Conflicts:
	extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.OisJoystick.h
	extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.desktop.ois.Ois.cpp
	extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.desktop.ois.OisJoystick.cpp
	extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/DesktopControllers.java
Nateificated
fixed linux builds
merged and fixed nate's changes
moo
Merge remote-tracking branch 'origin/master'

Conflicts:
	extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.desktop.ois.Ois.h
	extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.desktop.ois.OisJoystick.h
	extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/desktop/DesktopControllersBuild.java
	extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/desktop/ois/OisTest.java
Merge remote-tracking branch 'origin' into new3dapi
gdx-controllers, desktop works!
gdx-controllers, fixed desktop controllers with LwjglFrame/LwjglCanvas.
Dur importz
Javadoc.
Ran HeaderFixer.
Added newline for HeaderFixer.
integrated gdx-controllers into build, let's hope for the best
JsonLoaderTest loads and renders it's first model.