Fixed bug introduced from pull request #43 where condition checks would cause trade button to not display.
Fixed bug where targeted unit for trade can change during trade session.
Merge remote-tracking branch 'upstream/master'