Merge pull request #1 from frankh/master

GIVE ME
Trade window front-end

Ive implemented the other player trade windows in two ways (one way is
commented out in the LESS file). Choose between them.
Merge pull request #2 from lawoollett/master

Trade Window Front-end