Improved structure in Client GUI
Merge branch 'master' of https://github.com/golvmopp/sdmapeg