Server update
Merge branch 'master' of https://github.com/Turantul/sa_group9
Configuration stuff