Client finished
Merge branch 'master' of https://github.com/Graf-Nostro/SWAzam
beautifying
Merge branch 'master' of https://github.com/Graf-Nostro/SWAzam
Some minor changes