Modified Country and City models
Merge branch 'master' of https://github.com/yrlt/django-cities-light