This reverts commit 36bb4f9c.
genofire's cleanup See merge request !9
Fix typos See merge request !7
Prototype ambassadors: add Bremen + sort by Cityname See merge request !8