Merge pull request #10 from DarkstarProject/master

Merge
Trade bug fix

fixes following issues
put in item take it out, left a ghost item
one player accept, trade is changed, they don't have to re okay
Cancle trade it says he already have sent, and other player still sees
request
Merge pull request #623 from bope12/master

Trade fixes