bug fixes
Merge branch 'master' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht
j
Merge branch 'master' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht

Conflicts:
	src/main/java/de/spareripsproduction/madn/client/Main.java
äh
Merge branch 'master' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht

Conflicts:
	src/main/java/de/spareripsproduction/madn/client/scene/MenuScene.java
no message
no message
Merge branch 'master' into develop

Conflicts:
	.gitignore
	src/main/java/de/spareripsproduction/madn/client/Game.java
	src/main/java/de/spareripsproduction/madn/client/graphics/SpawnField.java
	src/main/java/de/spareripsproduction/madn/client/logic/Player.java
	src/main/java/de/spareripsproduction/madn/client/scene/GameScene.java
	src/main/java/de/spareripsproduction/madn/client/scene/Scene.java
Ignore