Include distserver
Merge remote-tracking branch 'origin/master'
Server added
Merge remote-tracking branch 'origin/master'
GUI refactoring