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

Conflicts:
	core/src/com/aau/auris/game/webcam/WebcamHandler.java
errorfix