MAP-853:  Base reporting infrastructure (requires database update)
MAP-864:  Color code change on map entry selection
Two bug fixes:
* Conflict assignment bug
* Work retrieval bug
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	rest/src/main/java/org/ihtsdo/otf/mapping/rest/ReportServiceRest.java