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

Conflicts:
	core/src/com/aau/auris/game/screens/GameScreen.java
Merge branch 'master' of https://github.com/Internship-AURIS/Project-AURIS

Conflicts:
	core/src/com/aau/auris/game/screens/GameScreen.java
	core/src/com/aau/auris/game/webcam/WebCamPreview.java
bugfix: cannot fix shaperenderer.drawLine