MAP-127: As an admin, I need to integrate the overarching OTF security solution with user and role management within OTF Mapping application
MAP-328: As a public user, I need a "guest" login that doesn't require a password.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	jpa-services/src/main/java/org/ihtsdo/otf/mapping/jpa/services/MappingServiceJpa.java
	model/src/main/java/org/ihtsdo/otf/mapping/helpers/MapUserRole.java
	rest/src/main/java/org/ihtsdo/otf/mapping/rest/MappingServiceRest.java
	webapp/src/main/webapp/app/js/controllers.js
	webapp/src/main/webapp/app/partials/login.html
MAP-127: As an admin, I need to integrate the overarching OTF security solution with user and role management within OTF Mapping application
MAP-328: As a public user, I need a "guest" login that doesn't require a password.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop