Trade with multiple cards of same type works, UI fixes
Merge branch 'master' of https://github.com/q41/PSD