MLDS-32 Move type and otherText from PrimaryApplication to AffiliateDetails
Merge branch 'develop' into feature/MLDS-32-type-other

Conflicts:
	src/main/java/ca/intelliware/ihtsdo/mlds/service/affiliatesimport/AffiliatesMapper.java
MLDS-32 Allow editing of main affiliate type and otherText
MLDS-32 Allow editing of "type" and "otherText" fields.  Merge branch 'feature/MLDS-32-type-other' into develop