Sync cazfi with my latest development on freeciv-web. This is current build on production server.