Fix JSON parsing for map.
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ui/LevelMenu.java
Strange Commit
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/states/OptionsMenuState.java
strange commit #2