Server Client additions
Merge branch 'master' of https://github.com/Portgas-D-Ace/Delegator