Merge branch '62-friendly-names' into '2.1-dev'

Add friendly building names attribute

See merge request !30
3 jobs for 37-facility-logo in 1 minute and 36 seconds (queued for 2 seconds)