fixed trade bug
Merge branch 'master' into georgiana

y