fixing player color stuff
Merge branch 'master' of github.com:255/catan
fixed assertion AcceptTradeCommand problem