update
Merge branch 'master' of https://github.com/Internship-AURIS/Project-AURIS

Conflicts:
	desktop/userdata.json
improved rectangle painting and simlified code
added threadpool
fixed race condition bug
add and remove of bodies must happen after world.step
Merge branch 'master' of https://github.com/Internship-AURIS/Project-AURIS
Merge remote-tracking branch 'remotes/origin/fix_race_condition'

Conflicts:
	core/src/com/aau/auris/game/level/Level.java
	core/src/com/aau/auris/game/level/gameworld/Obstacle.java
	core/src/com/aau/auris/game/screens/GameScreen.java
merged fix_race_condition and master successfully; create new branch to upload
update