Pull inn all changes to freeciv-web from Marco Lindqvist.

Pull inn all changes to freeciv-web from Marco Lindqvist.