deleted main from non-gui admin/client
Merge remote-tracking branch 'origin/master'