Merge branch 'master' into production
fixed problem where board's settlement round would advance twice when a settlement round began with only one building to be placed on neutral player's board.
Merge branch 'production'