Merge pull request #2 from andreasrosdal/master

Sync cazfi with my latest development on freeciv-web.
Use freeciv from S2_5 branching point (trunk r22812)
Merge pull request #13 from cazfi/master

Sync with latest updates from cazfi.