Local changes for Havilah production server.
Merge branch 'master' of github.com:Atlantis-PBEM/Atlantis
Merge branch 'master' of github.com:Atlantis-PBEM/Atlantis
Merge branch 'master' of github.com:Atlantis-PBEM/Atlantis
Merge branch 'master' of github.com:Atlantis-PBEM/Atlantis