no message
Merge branch 'develop' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht into develop

Conflicts:
	src/main/java/de/spareripsproduction/madn/client/scene/SettingsScene.java