MAP-260: Improve display of notes and advice
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service.git
MAP-260: Improve display of notes and advice
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service.git
MAP-308: As a developer, I need to upgrade the mapping project model to
accommodate all role mappings.
Merge branch 'master' of
https://github.com/WestCoastInformatics/OTF-Mapping-Service.git

Conflicts:
	admin/mojo/src/main/java/org/ihtsdo/otf/mapping/mojo/MapProjectDataExportMojo.java
	admin/mojo/src/main/java/org/ihtsdo/otf/mapping/mojo/MapProjectDataImportMojo.java
	webapp/src/main/webapp/app/js/widgets/projectDetails/projectDetails.html