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

# By Angart
# Via Angart
* 'develop' of https://github.com/SpareRips-Productions/Mensch-aergere-dich-nicht:
  settings