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