some refactoring to make organization easier
prepare to Groups to use affiliations
clean up old affiliations
add sort to affiliations
merge from master
Merge pull request #1389 from ORCID/addAffGroups

Add aff groups