Iso code list for manual mapping
Iso code list for manual mapping
Merge origin/master

Conflicts:
	query/CategorySportsPeopleByNationToNation.txt