Fixing conflicts
Merge branch 'OrcidSSOProject' of github.com:ORCID/ORCID-Source into OrcidSSOProject