chaging card to ucard in trade
fixing test ucard
Merge pull request #1 from tian2992/ucard

Changing Trades Card for UserCard