[fixed] trade will now cancel if you move objects around

Change-Id: I18eb4936ca71ee760eeb11fad71cfba568ddf7a2
Merge "[fixed] trade will now cancel if you move objects around" into unstable