MAP-668: Add feedback mechanism
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	jpa-model/src/main/java/org/ihtsdo/otf/mapping/jpa/UserErrorJpa.java
	jpa-services/src/main/java/org/ihtsdo/otf/mapping/jpa/services/MappingServiceJpa.java
	jpa-services/src/main/java/org/ihtsdo/otf/mapping/jpa/services/WorkflowServiceJpa.java
	model/src/main/java/org/ihtsdo/otf/mapping/model/UserError.java
	pojo-model/src/main/java/org/ihtsdo/otf/mapping/pojo/UserErrorImpl.java
	rest/src/main/java/org/ihtsdo/otf/mapping/rest/MappingServiceRest.java
	rest/src/main/java/org/ihtsdo/otf/mapping/rest/RootServiceRest.java
	rest/src/main/java/org/ihtsdo/otf/mapping/rest/WorkflowServiceRest.java
	services/src/main/java/org/ihtsdo/otf/mapping/services/WorkflowService.java
	webapp/src/main/webapp/index.html
	webapp/src/main/webapp/js/app.js
	webapp/src/main/webapp/js/widgets/compareRecords/compareRecords.html
	webapp/src/main/webapp/js/widgets/compareRecords/compareRecords.js
MAP-668: Feedback mechanism help and modify conflict resolution splitters.