Normalize names in PSA e-mail composer (#520)
Merge branch 'master' into do-we-really-need-utf8-bytestring

Conflicts:
	srv/src/Util.hs