branch merge
spelling fixes
added HLA RPR FOM type mapper
Merge branch 'master' into hla