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

Conflicts:
	core/src/com/aau/auris/game/level/Level.java
update
up
Merge branch 'master' of https://github.com/Internship-AURIS/Project-AURIS into toWorldCoords_fix

Conflicts:
	core/src/com/aau/auris/game/level/Level.java
Merge branch 'master' of https://github.com/Internship-AURIS/Project-AURIS into toWorldCoords_fix
update
border is in world coordinates
fail
modified goal width