Move traders to server side
Merge pull request #750 from AVendettaForYou/master

Move traders to server side