Replace 'city' field with 'postcode'.
Capitalise postcode label.
Merge branch 'clomax/remove_firstname_surname'