Merge pull request #21 from Waverunner/tradingSystem

Finished up TradeService, moved trading opcodes