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

Conflicts:
	desktop/userdata.json
Merge branch 'master' of https://github.com/Internship-AURIS/Project-AURIS

Conflicts:
	core/src/com/aau/auris/game/AURISGame.java
	core/src/com/aau/auris/game/Asset/AssetLoader.java
Update