Rewrite area intro sentence (#2336)
Add address to post office preset (fixes #2332)
Merge branch 'master' into preset-cleanup

Conflicts:
	data/presets/presets.json
	data/presets/presets/amenity/post_office.json