Removed extern references to global city
Added uids for citizens
Merge remote-tracking branch 'jnstw/objectify' into jnstwpull