git fix
Merge branch 'master' of https://github.com/hipsterfister/DSM.git

Conflicts:
	thegame/thegame/core/src/main/java/dhbw/karlsruhe/dsm/core/ExitGameScreen.java