First draft of XML schema changes for affiliations.
Added class to JAXB model for disambiguation affiliations.
Upgraded to the latest version of JRebel Maven plugin.
Updated JAXB and JPA model for new way of doing affiliations.
Removed some old UI stuff related to old way of doing affiliations.
Updated ORCID message schema so that all <country> elements are
explicitly restricted to ISO-3166 (2 letter codes).
Made org affilation relation entity profile aware, so will automatically
update the last modified of the profile it belongs to when changed.
Added org manager and DAO.
Added put-code to affiliation.
Merge branch 'master' into dev-affiliations2
Hand formatted so that JAXB annotation and enum value are on the same
line, and so easier to read.
First attempt at API calls for affiliations.
Fixed data clean up for integration tests.
Added new messages for affiliations scopes in English, and add
placeholders for other languages.
Added migration script to add affiliations scopes to existing clients.
Added affiliations scopes to list of scopes for new clients.
Added integration test for adding affiliations using authorization code,
and filled in missing pieces of API for affiliations.
Fixed reuse of existing Hibernate entities in JAXB to JPA conversion.
Changed so that existing org is reused if already exists.
Filled in source of affiliation.
Merge branch 'master' into dev-affiliations2

Conflicts:
	orcid-api-web/src/test/java/org/orcid/api/t2/server/delegator/T2OrcidApiServiceVersionedDelegatorTest.java
	orcid-core/src/main/java/org/orcid/core/adapter/impl/Jaxb2JpaAdapterImpl.java
	orcid-core/src/main/java/org/orcid/core/utils/OrcidJaxbCopyUtils.java
	orcid-core/src/main/java/org/orcid/core/version/impl/OrcidMessageVersionConverterImplV1_0_17ToV1_0_18.java
	orcid-core/src/main/java/org/orcid/core/version/impl/OrcidMessageVersionConverterImplV1_0_18ToV1_0_19.java
	orcid-core/src/main/resources/i18n/messages_en.properties
	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_orc.properties
	orcid-core/src/main/resources/i18n/messages_zh_CN.properties
	orcid-core/src/main/resources/i18n/messages_zh_TW.properties
	orcid-core/src/main/resources/orcid-core-context.xml
	orcid-model/src/main/resources/orcid-message-1.0.18.xsd
	orcid-model/src/main/resources/orcid-message-1.0.19.md
	orcid-model/src/main/resources/orcid-message-1.0.19.xsd
	orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ProfileEntity.java
	orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/WorkEntity.java
	orcid-persistence/src/main/resources/db-master.xml
	orcid-persistence/src/test/java/org/orcid/persistence/dao/ProfileDaoTest.java
	orcid-test/src/main/resources/data/EmptyEntityData.xml
	orcid-test/src/main/resources/data/ProfileEntityData.xml
	orcid-web/src/main/java/org/orcid/frontend/web/controllers/WorksController.java
Merge branch 'master' into dev-affiliations2

Conflicts:
	orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/EmailEntity.java
Merge branch 'dev-fixVersionConverterChain' into dev-affiliations2
Implemented privacy rules for affiliations.
Made adding affiliations via the member API more efficient, by only
writing new affiliations to the DB.