Changes to get Brian's material
Merge branch 'master' of
https://github.com/WestCoastInformatics/OTF-Mapping-Service

Conflicts:
	config/src/main/resources/filters.properties.dev
	jpa-services/src/main/java/org/ihtsdo/otf/mapping/jpa/services/ContentServiceJpa.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/helpers/ProjectSpecificAlgorithmHandler.java
	model/src/main/java/org/ihtsdo/otf/mapping/helpers/WorkflowAction.java
	webapp/src/main/webapp/app/js/widgets/mapRecord/mapRecord.js
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service
Code cleanup revisions.
Some comment removal.
Merge branch 'master' of
https://github.com/WestCoastInformatics/OTF-Mapping-Service

Conflicts:
	model/src/main/java/org/ihtsdo/otf/mapping/helpers/ProjectSpecificAlgorithmHandler.java
	model/src/main/java/org/ihtsdo/otf/mapping/helpers/WorkflowAction.java
	model/src/main/java/org/ihtsdo/otf/mapping/model/MapProject.java
	services/src/main/java/org/ihtsdo/otf/mapping/services/MappingService.java
	services/src/main/java/org/ihtsdo/otf/mapping/services/MetadataService.java
	webapp/src/main/webapp/app/js/widgets/mapRecord/mapRecord.js
	webapp/src/main/webapp/app/partials/login.html
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service

Conflicts:
	jpa-services/src/main/java/org/ihtsdo/otf/mapping/jpa/services/MetadataServiceJpa.java
Armageddon Push.