change settings
Merge branch 'master' of https://github.com/LukasLeppich/FHWS_REST.git