Finished npc trading and port labels
Merge branch 'master' of https://bitbucket.org/cressel/catan
Fixed dev card bug
Merge branch 'master' of https://bitbucket.org/cressel/catan