Merge pull request #1 from andreasrosdal/master

Pull request to bring cazfi fork in sync with andreas fork. Let's keep the forks in sync.
Renamed database 'freeciv_net' as 'freeciv_web'
Merge pull request #12 from cazfi/master

pull in latest changes from cazfi.