Update to freeciv/freeciv-web master