Use city names for orgs, store portals in extra field
Merge branch 'master' of github.com:okfde/odm-datenerfassung