Added Kosovo.
Corrected use of internal and external IDs for disambiguated
affiliations.
First attempt at adding an additional core to SOLR for org search.
First attempt at multi-core SOLR.
First attempt at script for indexing orgs.
Added org type to index.
Switched affiliations look up in UI to use SOLR instead of DB.
Added script for update popularity of disambiguated orgs.
Set up cron tasks for processing disambiguated orgs.
Added popularity to index, and used for sorting in search for
affiliations.
Add default value for popularity.
Updated so that indexing status if flagged as PENDING.
Fixed duplicate check.
Improved logging.
Refactored into shorter, more readable methods.
Made batch methods synchronized so that can only have ever have one
instance running in the scheduler.
Added automatic migration of SOLR data directory to multi-core form.
Merge branch 'fixUnitTestProblemsWithAffiliations' into useSolrForAffiliationsLookup

Conflicts:
	orcid-web/src/main/java/org/orcid/frontend/web/controllers/AffiliationsController.java
Fixed some bugs in the disambiguated affiliation UI stuff.
Changed so that org info is returned from API in affiliation meta-data,
even if linked to disambiguated org.
Merge branch 'master' into addKosovo

Conflicts:
	orcid-core/src/main/resources/i18n/messages_es.properties
	orcid-core/src/main/resources/i18n/messages_fr.properties
	orcid-core/src/main/resources/i18n/messages_zh_CN.properties
	orcid-core/src/main/resources/i18n/messages_zh_TW.properties
Fixed test data so work with the latest token expiry stuff.
Also, added some null checking around new token expiry stuff to keep the
unit tests simple and working.
Merge pull request #618 from ORCID/fixBadScopeInUnitTestData

Fixed test data so work with the latest token expiry stuff.
Merge pull request #616 from ORCID/useSolrForAffiliationsLookup

Use solr for affiliations lookup
Merge pull request #619 from ORCID/addKosovo

Add kosovo