City/country pages update
Merge branch 'master' of https://github.com/openaid-IATI/urbannumbers