Case insensitive city
Merge branch 'master' of github.com:futurice/annihilation